WineHQ: winetest: follow Dimi's changes

[Ferenc Wagner]

ChangeLog:
- winetest.cron: Revert setting of LANG
- dissect: The new fields always contain a placeholder at least.
- gather: File names are computed by winetest.exe.

Index: dissect
===================================================================
RCS file: /home/wine/tools/winetest/dissect,v
retrieving revision 1.4
diff -u -r1.4 dissect
--- dissect	18 Mar 2004 19:03:16 -0000	1.4
+++ dissect	23 Mar 2004 11:44:02 -0000
@@ -133,9 +133,9 @@
 while (<IN>) {
     if (!defined $unit) {       # new test
         next if /^\s*$/;
-        m|([_.a-z0-9]+):([_a-z]+) start( [/_.a-z0-9]+( [0-9]+[.0-9]*)?)?\r?$|
+        m[([_.a-z0-9]+):([_a-z]+) start ([/_.a-z0-9]+) (-|[.0-9]+)\r?$]
           or mydie "no start line:$.: $_";
-        ($unit,$test,$source,$rev) = ($1,$2,$3||"-",$4||"-");
+        ($unit,$test,$source,$rev) = ($1,$2,$3,$4);
         open OUT, ">:raw", $tmpfile or mydie "can't open $tmpfile: $!\n";
     } elsif (s/$unit:$test done \(.*\)\r?$//) {
         chomp;                  # current test failed
Index: gather
===================================================================
RCS file: /home/wine/tools/winetest/gather,v
retrieving revision 1.3
diff -u -r1.3 gather
--- gather	18 Mar 2004 19:03:16 -0000	1.3
+++ gather	23 Mar 2004 11:44:02 -0000
@@ -31,13 +31,6 @@
 require "winetest.conf";
 my $fileversion = 2;
 
-# Exceptional unit->directory mappings
-my %unitdir = ("gdi32"        => "gdi",
-               "kernel32"     => "kernel",
-               "user32"       => "user",
-               "winspool.drv" => "winspool",
-               "ws2_32"       => "winsock");
-
 # Group result containers.  Keys:
 # name: group name
 # extrema: hashes min and max error numbers to test names
@@ -99,11 +92,8 @@
         my ($digest, $unit, $test, $count, $todo, $error,
             $source, $rev) = split;
         my $testname = "$unit:$test";
-        my $srcdir = $unitdir{$unit} || $unit;
         $testref->{results}->{$testname} = [$count, $todo, $error];
-        $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/".
-            ($source ne "-"?$source:"dlls/$srcdir/tests/$test.c").
-            ($rev ne "-"?"#rev$rev":"")
+        $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"")
             unless exists $alltests{$testname};
         if ($count ne "failed") {
             if (defined $group->{extrema}->{$testname}) {
Index: winetest.cron
===================================================================
RCS file: /home/wine/tools/winetest/winetest.cron,v
retrieving revision 1.3
diff -u -r1.3 winetest.cron
--- winetest.cron	15 Mar 2004 19:07:15 -0000	1.3
+++ winetest.cron	23 Mar 2004 11:44:02 -0000
@@ -3,7 +3,6 @@
 # Cron job for generating winetest reports.  Use it like
 # */5 * * * * apache winetest.cron
 
-LANG=en_US
 lock=/tmp/winetest.lock
 if [ ! -f $lock ]; then
     touch $lock