Alexandre Julliard : winetest: Store the missing dll information in the summary file.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: e080506243bb0546729e8245cb39c4376260959e
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=e080506243bb0546729e8245c...

Author: Alexandre Julliard 
Date:   Thu Jun  5 16:13:45 2008 +0200

winetest: Store the missing dll information in the summary file.

Remove some more support for obsolete file formats.

---

winetest/dissect |   12 ++++--------
 winetest/gather  |   23 +++++++----------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 0df0f56..66a3bd4 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -183,6 +183,10 @@ while ($_ = <IN>) {
     s/\r+$//;
     last if (!/^\s+([^ =]+)=(.*)\r?$/);
     $dllinfo{$1} = { version => $2 };
+    if ($2 eq "dll is missing")
+    {
+        print SUM "- $1 - missing - - - - -\n";
+    }
 }

/^Test output:/ or mydie "no test header: $_";
@@ -334,14 +338,6 @@ for (my $i = 0; $i <= $#boxes; $i++)
     close FILE or mydie "error writing to '$tmpdir/$boxes[$i]->{id}.html': $!\n";
 }

-if (%dllinfo) {
-    open DLLINFO, ">$tmpdir/dllinfo.txt" or mydie "unable to open '$tmpdir/dllinfo.txt' for writing: $!\n";
-    foreach my $dll (sort keys %dllinfo) {
-        print DLLINFO "$dll=$dllinfo{$dll}->{version}\n";
-    }
-    close DLLINFO or mydie "error writing to '$tmpdir/dllinfo.txt': $!\n";
-}
-
 my $builddir = "$datadir/$testbuild";
 foreach ($datadir, $builddir) {
     if (!(-d $_ || mkdir $_)) {
diff --git a/winetest/gather b/winetest/gather
index 26dacb7..8ea31c7 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -122,7 +122,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") {
     }

my $report = { group => $group};
-    # Read the dll information if present (newer type reports)
+    # Read the dll information if present
     my $dllinfo = "$datadir/$build/$dir/dllinfo.txt";
     if (open DLLINFO, "<$dllinfo") {
         while ($_ = <DLLINFO>) {
@@ -153,15 +153,14 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") {
             $source, $rev) = split;
         my $testname = "$dll:$unit";

-        $alltests{$testname} = $source;
-
-        # Leave this in for older type reports
-        if ($unit =~ /_dll_missing/ or
-            ($count eq "0" and exists $report->{dllmissing}->{$dll})) {
-            # Mark the dll as missing on this system
+        if ($count eq "missing")
+        {
             $report->{dllmissing}->{$dll} = 1;
             next;
         }
+
+        $alltests{$testname} = $source;
+
         if ($count eq "failed") {
             if ($todos eq "crash") {
                 $report->{$testname} = { status => "winetest crash" };
@@ -331,21 +330,13 @@ sub build_header_footer($)
         <a href="$report->{dir}/dllinfo.html">[info]</a>
         <a href="$report->{dir}/report.html">[file]</a></small>
 EOF
-            # If dllinfo.txt exist we use a different layout (new style report)
-            } elsif (-r "$datadir/$build/$report->{dir}/dllinfo.txt") {
+            } else {
                 $msg = <<"EOF";
         $group->{name}<br><small>
         <a href="$report->{dir}/version.txt">$report->{tag}</a><br>
         <a href="$report->{dir}/dllinfo.txt">[info]</a>
         <a href="$report->{dir}/report">[file]</a></small>
 EOF
-            } else {
-                $msg = <<"EOF";
-        $group->{name}<br><small>
-        <a href="$report->{dir}/build.txt">$report->{tag}</a><br>
-        <a href="$report->{dir}/version.txt">[info]</a>
-        <a href="$report->{dir}/report">[file]</a></small>
-EOF
             }
             chop $msg;
         }