compare_dg_tests.pl: Reorder status change handlers.

Rename NEW_PASSES into PASS_APPEARS for consistency.

Change-Id: Ifa31438b1c997c181e9d7fddc1d09c400e03cfa8

1 files changed, 39 insertions, 38 deletions

diff --git a/compare_dg_tests.pl b/compare_dg_tests.pl
index 49d2e26..fc4e544 100755
--- a/compare_dg_tests.pl
+++ b/compare_dg_tests.pl
@@ -18,57 +18,58 @@ sub usage();
 sub print_compare_results_summary($$);
 sub nothing($$$$);
 
-# OK
 my $PASS_PASS             = "Still passes              [PASS => PASS]";
-my $FAIL_FAIL             = "Still fails               [FAIL => FAIL]";
+my $PASS_XPASS            = "PASS now XPASS            [PASS =>XPASS]";
+my $PASS_FAIL             = "PASS now FAIL             [PASS => FAIL]";
+my $PASS_XFAIL            = "PASS now XFAIL            [PASS =>XFAIL]";
+my $PASS_DISAPPEARS       = "PASS disappears           [PASS =>     ]";
+my $PASS_APPEARS	  = "New PASS                  [     => PASS]";
+my $PASSED_NOW_TIMEOUTS   = "Timeout                   [PASS =>T.OUT]";
+
+my $XPASS_PASS            = "XPASS now PASS            [XPASS=> PASS]";
 my $XPASS_XPASS           = "Still xpass               [XPASS=>XPASS]";
-my $XFAIL_XFAIL           = "Still xfail               [XFAIL=>XFAIL]";
+my $XPASS_FAIL            = "XPASS now FAIL            [XPASS=> FAIL]";
+my $XPASS_XFAIL           = "XPASS now XFAIL           [XPASS=>XFAIL]";
+my $XPASS_DISAPPEARS      = "XPASS disappears          [XPASS=>     ]";
+my $XPASS_APPEARS         = "XPASS appears             [     =>XPASS]";
 
-# TO BE CHECKED
-my $PASS_XFAIL            = "PASS now XFAIL            [PASS =>XFAIL]";
-my $XFAIL_APPEARS         = "XFAIL appears             [     =>XFAIL]";
+my $FAIL_PASS             = "FAIL now PASS             [FAIL => PASS]";
+my $FAIL_XPASS            = "FAIL now XPASS            [FAIL =>XPASS]";
+my $FAIL_FAIL             = "Still fails               [FAIL => FAIL]";
 my $FAIL_XFAIL            = "FAIL now XFAIL            [FAIL =>XFAIL]";
-my $XPASS_XFAIL           = "XPASS now XFAIL           [XPASS=>XFAIL]";
-my $PASSED_NOW_TIMEOUTS   = "Timeout                   [PASS =>T.OUT]";
 my $FAIL_DISAPPEARS	  = "FAIL disappears           [FAIL =>     ]";
-my $XPASS_PASS            = "XPASS now PASS            [XPASS=> PASS]";
+my $FAIL_APPEARS          = "FAIL appears              [     => FAIL]";
+
 my $XFAIL_PASS            = "XFAIL now PASS            [XFAIL=> PASS]";
 my $XFAIL_XPASS           = "XFAIL now XPASS           [XFAIL=>XPASS]";
-my $FAIL_PASS             = "FAIL now PASS             [FAIL => PASS]";
-my $FAIL_XPASS            = "FAIL now XPASS            [FAIL =>XPASS]";
-my $NEW_PASSES		  = "New PASS                  [     => PASS]";
-my $UNHANDLED_CASES	  = "Unhandled cases           [   ..??..   ]";
-my $UNSTABLE_CASES	  = "Unstable cases, ignored   [~RANDOM     ]";
+my $XFAIL_FAIL            = "XFAIL now FAIL            [XFAIL=> FAIL]";
+my $XFAIL_XFAIL           = "Still xfail               [XFAIL=>XFAIL]";
+my $XFAIL_DISAPPEARS	  = "XFAIL disappears          [XFAIL=>     ]";
+my $XFAIL_APPEARS         = "XFAIL appears             [     =>XFAIL]";
+
+my $UNSUPPORTED_PASS      = "UNSUPPORTED now PASS      [UNSUP=> PASS]";
 my $UNSUPPORTED_XPASS     = "UNSUPPORTED now XPASS     [UNSUP=>XPASS]";
+my $UNSUPPORTED_FAIL      = "UNSUPPORTED now FAIL      [UNSUP=> FAIL]";
 my $UNSUPPORTED_XFAIL     = "UNSUPPORTED now XFAIL     [UNSUP=>XFAIL]";
 my $UNSUPPORTED_DISAPPEARS= "UNSUPPORTED disappears    [UNSUP=>     ]";
+my $UNSUPPORTED_APPEARS   = "UNSUPPORTED appears       [     =>UNSUP]";
+
 my $UNTESTED_PASS         = "UNTESTED now PASS         [UNTES=> PASS]";
+my $UNTESTED_XPASS        = "UNTESTED now XPASS        [UNTES=>XPASS]";
+my $UNTESTED_FAIL         = "UNTESTED now FAIL         [UNTES=> FAIL]";
 my $UNTESTED_XFAIL        = "UNTESTED now XFAIL        [UNTES=>XFAIL]";
 my $UNTESTED_DISAPPEARS   = "UNTESTED disappears       [UNTES=>     ]";
+my $UNTESTED_APPEARS      = "UNTESTED appears          [     =>UNTES]";
+
 my $UNRESOLVED_PASS       = "UNRESOLVED now PASS       [UNRES=> PASS]";
+my $UNRESOLVED_XPASS      = "UNRESOLVED now XPASS      [UNRES=>XPASS]";
+my $UNRESOLVED_FAIL       = "UNRESOLVED now FAIL       [UNRES=> FAIL]";
 my $UNRESOLVED_XFAIL      = "UNRESOLVED now XFAIL      [UNRES=>XFAIL]";
 my $UNRESOLVED_DISAPPEARS = "UNRESOLVED disappears     [UNRES=>     ]";
-my $UNSUPPORTED_APPEARS   = "UNSUPPORTED appears       [     =>UNSUP]";
-my $UNTESTED_APPEARS      = "UNTESTED appears          [     =>UNTES]";
-
-# REGRESSIONS
-my $PASS_XPASS            = "PASS now XPASS            [PASS =>XPASS]";
-my $PASS_FAIL             = "PASS now FAIL             [PASS => FAIL]";
-my $PASS_DISAPPEARS       = "PASS disappears           [PASS =>     ]";
-my $XPASS_DISAPPEARS      = "XPASS disappears          [XPASS=>     ]";
-my $FAIL_APPEARS          = "FAIL appears              [     => FAIL]";
-my $XPASS_APPEARS         = "XPASS appears             [     =>XPASS]";
 my $UNRESOLVED_APPEARS    = "UNRESOLVED appears        [     =>UNRES]";
-my $XPASS_FAIL            = "XPASS now FAIL            [XPASS=> FAIL]";
-my $XFAIL_FAIL            = "XFAIL now FAIL            [XFAIL=> FAIL]";
-my $XFAIL_DISAPPEARS	  = "XFAIL disappears          [XFAIL=>     ]";
 
-my $UNSUPPORTED_PASS      = "UNSUPPORTED now PASS      [UNSUP=> PASS]";
-my $UNSUPPORTED_FAIL      = "UNSUPPORTED now FAIL      [UNSUP=> FAIL]";
-my $UNTESTED_FAIL         = "UNTESTED now FAIL         [UNTES=> FAIL]";
-my $UNTESTED_XPASS        = "UNTESTED now XPASS        [UNTES=>XPASS]";
-my $UNRESOLVED_FAIL       = "UNRESOLVED now FAIL       [UNRES=> FAIL]";
-my $UNRESOLVED_XPASS      = "UNRESOLVED now XPASS      [UNRES=>XPASS]";
+my $UNHANDLED_CASES	  = "Unhandled cases           [   ..??..   ]";
+my $UNSTABLE_CASES	  = "Unstable cases, ignored   [~RANDOM     ]";
 
 my @handler_list = (
   {was=>"PASS",     is=>"PASS",     cat=>$PASS_PASS},
@@ -88,7 +89,7 @@ my @handler_list = (
   {was=>"XFAIL",    is=>"XPASS",    cat=>$XFAIL_XPASS},
   {was=>"FAIL",     is=>"PASS",     cat=>$FAIL_PASS},
   {was=>"FAIL",     is=>"XPASS",    cat=>$FAIL_XPASS},
-  {was=>"NO_EXIST", is=>"PASS",     cat=>$NEW_PASSES},
+  {was=>"NO_EXIST", is=>"PASS",     cat=>$PASS_APPEARS},
   {was=>"NO_EXIST", is=>"XPASS",    cat=>$XPASS_APPEARS},
 
   {was=>"PASS",     is=>"FAIL",     handler=>\&handle_pass_fail},
@@ -319,7 +320,7 @@ sub compare_results($$)
    @{$res->{$XPASS_DISAPPEARS}} = ();
    @{$res->{$FAIL_APPEARS}} = ();
    @{$res->{$XPASS_APPEARS}} = ();
-   @{$res->{$NEW_PASSES}} = ();
+   @{$res->{$PASS_APPEARS}} = ();
    @{$res->{$FAIL_DISAPPEARS}} = ();
    @{$res->{$XFAIL_DISAPPEARS}} = ();
    @{$res->{$XFAIL_APPEARS}} = ();
@@ -597,7 +598,7 @@ sub print_compare_results_summary($$)
 	   scalar(@{$res->{$XFAIL_XPASS}})+
 	   scalar(@{$res->{$FAIL_PASS}})+
 	   scalar(@{$res->{$FAIL_XPASS}})+
-	   scalar(@{$res->{$NEW_PASSES}})+
+	   scalar(@{$res->{$PASS_APPEARS}})+
 	   scalar(@{$res->{$FAIL_DISAPPEARS}})+
 	   scalar(@{$res->{$XFAIL_APPEARS}})+
 	   scalar(@{$res->{$FAIL_XFAIL}})+
@@ -628,7 +629,7 @@ sub print_compare_results_summary($$)
        printf "  | %-40s | %7d |\n", $XFAIL_XPASS, scalar(@{$res->{$XFAIL_XPASS}}) if (scalar(@{$res->{$XFAIL_XPASS}}));
        printf "  | %-40s | %7d |\n", $FAIL_PASS, scalar(@{$res->{$FAIL_PASS}}) if (scalar(@{$res->{$FAIL_PASS}}));
        printf "  | %-40s | %7d |\n", $FAIL_XPASS, scalar(@{$res->{$FAIL_XPASS}}) if (scalar(@{$res->{$FAIL_XPASS}}));
-       printf "  | %-40s | %7d |\n", $NEW_PASSES, scalar(@{$res->{$NEW_PASSES}}) if (scalar(@{$res->{$NEW_PASSES}}));
+       printf "  | %-40s | %7d |\n", $PASS_APPEARS, scalar(@{$res->{$PASS_APPEARS}}) if (scalar(@{$res->{$PASS_APPEARS}}));
        printf "  | %-40s | %7d |\n", $UNSUPPORTED_PASS, scalar(@{$res->{$UNSUPPORTED_PASS}}) if (scalar(@{$res->{$UNSUPPORTED_PASS}}));
        printf "  | %-40s | %7d |\n", $UNSUPPORTED_XFAIL, scalar(@{$res->{$UNSUPPORTED_XFAIL}}) if (scalar(@{$res->{$UNSUPPORTED_XFAIL}}));
        printf "  | %-40s | %7d |\n", $UNSUPPORTED_DISAPPEARS, scalar(@{$res->{$UNSUPPORTED_DISAPPEARS}}) if (scalar(@{$res->{$UNSUPPORTED_DISAPPEARS}}));
@@ -672,7 +673,7 @@ sub print_compare_results_summary($$)
 	      print_tclist($UNRESOLVED_XFAIL, @{$res->{$UNRESOLVED_XFAIL}});
 	      print_tclist($UNRESOLVED_DISAPPEARS, @{$res->{$UNRESOLVED_DISAPPEARS}});
 	      print_tclist($UNSTABLE_CASES, @{$res->{$UNSTABLE_CASES}});
-	      print_tclist($NEW_PASSES, @{$res->{$NEW_PASSES}});
+	      print_tclist($PASS_APPEARS, @{$res->{$PASS_APPEARS}});
        }
        printf "$col_reset\n";
    }