Alexandre Julliard : winetest: Ignore user-skipped tests also when merging with a missing dll case.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Apr 21 11:51:55 2011 +0200

winetest: Ignore user-skipped tests also when merging with a missing dll case.

---

 winetest/gather |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/winetest/gather b/winetest/gather
index ccce11c..8a538d9 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -209,11 +209,15 @@ sub merge_status($$)
     my ($group_result, $result) = @_;
     if (!defined $group_result->{status}) {
         $group_result->{status} = $result->{status};
-    } elsif ($group_result->{status} =~ /^(dll missing|skipped)$/ and
+    } elsif ($group_result->{status} eq "skipped") {
+        $group_result->{status} = $result->{status};
+    } elsif ($result->{status} eq "skipped") {
+        ; # Nothing to do
+    } elsif ($group_result->{status} eq "dll missing" and
              $result->{status} eq "run") {
         $group_result->{status} = "run";
     } elsif ($group_result->{status} eq "run" and
-             $result->{status} =~ /^(dll missing|skipped)$/) {
+             $result->{status} eq "dll missing") {
         ; # Nothing to do
     } elsif ($group_result->{status} ne $result->{status}) {
         $group_result->{status} = "mixed";