Francois Gouget : winetest: Get the work directory directly from the web server.
Alexandre Julliard
julliard at winehq.org
Wed Jun 7 12:12:30 CDT 2017
Module: tools
Branch: master
Commit: 0708ab216e005ae740a5346ca6ae1bb308cbe6a5
URL: http://source.winehq.org/git/tools.git/?a=commit;h=0708ab216e005ae740a5346ca6ae1bb308cbe6a5
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Jun 7 11:07:22 2017 +0200
winetest: Get the work directory directly from the web server.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
winetest/vhost_winetest.conf | 1 +
winetest/winetest.cgi | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/winetest/vhost_winetest.conf b/winetest/vhost_winetest.conf
index 797aac3..6d72ccc 100644
--- a/winetest/vhost_winetest.conf
+++ b/winetest/vhost_winetest.conf
@@ -17,6 +17,7 @@
BEGIN
{
unshift @INC, "/home/wine/tools/winetest";
+ $::workdir = "/home/winehq/sites/winetest";
}
</Perl>
diff --git a/winetest/winetest.cgi b/winetest/winetest.cgi
index 9a4ad71..a2aebef 100755
--- a/winetest/winetest.cgi
+++ b/winetest/winetest.cgi
@@ -18,7 +18,7 @@
use strict;
use warnings;
-use vars qw/$workdir $maxfilesize/;
+use vars qw/$maxfilesize/;
BEGIN {
require "winetest.conf";
@@ -29,7 +29,7 @@ use File::Temp qw(tempdir);
use CGI qw(:standard);
# Cater for some overhead
$CGI::POST_MAX = $maxfilesize + 1024;
-$ENV{TMPDIR} = "$workdir/queue";
+$ENV{TMPDIR} = "$::workdir/queue";
my $name = param ("reportfile");
my $error = cgi_error ();
@@ -47,7 +47,7 @@ sub move_file($)
{
my ($filename) = @_;
my $orig = tmpFileName($filename);
- my $tmpdir = tempdir ("repXXXXX", DIR => "$workdir/queue");
+ my $tmpdir = tempdir ("repXXXXX", DIR => "$::workdir/queue");
chmod 0777, $tmpdir;
chmod 0666&~umask, $orig;
my $size = -s $orig;
More information about the wine-cvs
mailing list