compare_dg_tests.pl: Make status change handler names more uniform.

Change-Id: I992555d21ab4406be20d07f3eccb9fb739a26979

1 files changed, 84 insertions, 84 deletions

diff --git a/compare_dg_tests.pl b/compare_dg_tests.pl
index 9522c7b..49d2e26 100755
--- a/compare_dg_tests.pl
+++ b/compare_dg_tests.pl
@@ -19,23 +19,23 @@ sub print_compare_results_summary($$);
 sub nothing($$$$);
 
 # OK
-my $STILL_PASSES          = "Still passes              [PASS => PASS]";
-my $STILL_FAILS           = "Still fails               [FAIL => FAIL]";
-my $STILL_XPASS           = "Still xpass               [XPASS=>XPASS]";
-my $STILL_XFAIL           = "Still xfail               [XFAIL=>XFAIL]";
+my $PASS_PASS             = "Still passes              [PASS => PASS]";
+my $FAIL_FAIL             = "Still fails               [FAIL => FAIL]";
+my $XPASS_XPASS           = "Still xpass               [XPASS=>XPASS]";
+my $XFAIL_XFAIL           = "Still xfail               [XFAIL=>XFAIL]";
 
 # TO BE CHECKED
-my $PASS_NOW_XFAIL        = "PASS now XFAIL            [PASS =>XFAIL]";
+my $PASS_XFAIL            = "PASS now XFAIL            [PASS =>XFAIL]";
 my $XFAIL_APPEARS         = "XFAIL appears             [     =>XFAIL]";
-my $FAIL_NOW_XFAIL        = "FAIL now XFAIL            [FAIL =>XFAIL]";
-my $XPASS_NOW_XFAIL       = "XPASS now XFAIL           [XPASS=>XFAIL]";
+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_NOW_PASSES      = "XPASS now PASS            [XPASS=> PASS]";
-my $XFAIL_NOW_PASSES      = "XFAIL now PASS            [XFAIL=> PASS]";
-my $XFAIL_NOW_XPASS       = "XFAIL now XPASS           [XFAIL=>XPASS]";
-my $FAIL_NOW_PASSES       = "FAIL now PASS             [FAIL => PASS]";
-my $FAIL_NOW_XPASS        = "FAIL now XPASS            [FAIL =>XPASS]";
+my $XPASS_PASS            = "XPASS now PASS            [XPASS=> PASS]";
+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     ]";
@@ -52,15 +52,15 @@ my $UNSUPPORTED_APPEARS   = "UNSUPPORTED appears       [     =>UNSUP]";
 my $UNTESTED_APPEARS      = "UNTESTED appears          [     =>UNTES]";
 
 # REGRESSIONS
-my $PASS_NOW_XPASS        = "PASS now XPASS            [PASS =>XPASS]";
-my $PASSED_NOW_FAILS      = "PASS now FAIL             [PASS => FAIL]";
+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_NOW_FAIL        = "XPASS now FAIL            [XPASS=> FAIL]";
-my $XFAIL_NOW_FAIL        = "XFAIL now FAIL            [XFAIL=> FAIL]";
+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]";
@@ -71,28 +71,28 @@ my $UNRESOLVED_FAIL       = "UNRESOLVED now FAIL       [UNRES=> FAIL]";
 my $UNRESOLVED_XPASS      = "UNRESOLVED now XPASS      [UNRES=>XPASS]";
 
 my @handler_list = (
-  {was=>"PASS",     is=>"PASS",     cat=>$STILL_PASSES},
-  {was=>"PASS",     is=>"XPASS",    cat=>$PASS_NOW_XPASS},
-  {was=>"XPASS",    is=>"PASS",     cat=>$XPASS_NOW_PASSES},
-  {was=>"XPASS",    is=>"XPASS",    cat=>$STILL_XPASS},
-  {was=>"FAIL",     is=>"FAIL",     cat=>$STILL_FAILS},
-  {was=>"FAIL",     is=>"XFAIL",    cat=>$FAIL_NOW_XFAIL},
-  {was=>"XFAIL",    is=>"FAIL",     cat=>$XFAIL_NOW_FAIL},
-  {was=>"XFAIL",    is=>"XFAIL",    cat=>$STILL_XFAIL},
-
-  {was=>"XPASS",    is=>"XFAIL",    cat=>$XPASS_NOW_XFAIL},
-  {was=>"PASS",     is=>"XFAIL",    cat=>$PASS_NOW_XFAIL},
+  {was=>"PASS",     is=>"PASS",     cat=>$PASS_PASS},
+  {was=>"PASS",     is=>"XPASS",    cat=>$PASS_XPASS},
+  {was=>"XPASS",    is=>"PASS",     cat=>$XPASS_PASS},
+  {was=>"XPASS",    is=>"XPASS",    cat=>$XPASS_XPASS},
+  {was=>"FAIL",     is=>"FAIL",     cat=>$FAIL_FAIL},
+  {was=>"FAIL",     is=>"XFAIL",    cat=>$FAIL_XFAIL},
+  {was=>"XFAIL",    is=>"FAIL",     cat=>$XFAIL_FAIL},
+  {was=>"XFAIL",    is=>"XFAIL",    cat=>$XFAIL_XFAIL},
+
+  {was=>"XPASS",    is=>"XFAIL",    cat=>$XPASS_XFAIL},
+  {was=>"PASS",     is=>"XFAIL",    cat=>$PASS_XFAIL},
   {was=>"FAIL",     is=>"NO_EXIST", cat=>$FAIL_DISAPPEARS},
   {was=>"XFAIL",    is=>"NO_EXIST", cat=>$XFAIL_DISAPPEARS},
-  {was=>"XFAIL",    is=>"PASS",     cat=>$XFAIL_NOW_PASSES},
-  {was=>"XFAIL",    is=>"XPASS",    cat=>$XFAIL_NOW_XPASS},
-  {was=>"FAIL",     is=>"PASS",     cat=>$FAIL_NOW_PASSES},
-  {was=>"FAIL",     is=>"XPASS",    cat=>$FAIL_NOW_XPASS},
+  {was=>"XFAIL",    is=>"PASS",     cat=>$XFAIL_PASS},
+  {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=>"XPASS",    cat=>$XPASS_APPEARS},
 
   {was=>"PASS",     is=>"FAIL",     handler=>\&handle_pass_fail},
-  {was=>"XPASS",    is=>"FAIL",     cat=>$XPASS_NOW_FAIL},
+  {was=>"XPASS",    is=>"FAIL",     cat=>$XPASS_FAIL},
   {was=>"PASS",     is=>"NO_EXIST", cat=>$PASS_DISAPPEARS},
   {was=>"XPASS",    is=>"NO_EXIST", cat=>$XPASS_DISAPPEARS},
   {was=>"NO_EXIST", is=>"FAIL",     cat=>$FAIL_APPEARS},
@@ -302,7 +302,7 @@ sub handle_pass_fail($$$$)
    }
    else
    {
-     push @{$res->{$PASSED_NOW_FAILS}}, $tc;
+     push @{$res->{$PASS_FAIL}}, $tc;
    }
 }
 
@@ -310,11 +310,11 @@ sub compare_results($$)
 {
    my ($ref, $res) = @_;
 
-   @{$res->{$STILL_PASSES}} = ();
-   @{$res->{$STILL_FAILS}} = ();
-   @{$res->{$STILL_XPASS}} = ();
-   @{$res->{$PASSED_NOW_FAILS}} = ();
-   @{$res->{$XPASS_NOW_FAIL}} = ();
+   @{$res->{$PASS_PASS}} = ();
+   @{$res->{$FAIL_FAIL}} = ();
+   @{$res->{$XPASS_XPASS}} = ();
+   @{$res->{$PASS_FAIL}} = ();
+   @{$res->{$XPASS_FAIL}} = ();
    @{$res->{$PASS_DISAPPEARS}} = ();
    @{$res->{$XPASS_DISAPPEARS}} = ();
    @{$res->{$FAIL_APPEARS}} = ();
@@ -323,17 +323,17 @@ sub compare_results($$)
    @{$res->{$FAIL_DISAPPEARS}} = ();
    @{$res->{$XFAIL_DISAPPEARS}} = ();
    @{$res->{$XFAIL_APPEARS}} = ();
-   @{$res->{$FAIL_NOW_XFAIL}} = ();
-   @{$res->{$PASS_NOW_XFAIL}} = ();
-   @{$res->{$XPASS_NOW_XFAIL}} = ();
+   @{$res->{$FAIL_XFAIL}} = ();
+   @{$res->{$PASS_XFAIL}} = ();
+   @{$res->{$XPASS_XFAIL}} = ();
    @{$res->{$XPASS_APPEARS}} = ();
-   @{$res->{$PASS_NOW_XPASS}} = ();
-   @{$res->{$XPASS_NOW_PASSES}} = ();
-   @{$res->{$XFAIL_NOW_PASSES}} = ();
-   @{$res->{$XFAIL_NOW_XPASS}} = ();
-   @{$res->{$XFAIL_NOW_FAIL}} = ();
-   @{$res->{$FAIL_NOW_PASSES}} = ();
-   @{$res->{$FAIL_NOW_XPASS}} = ();
+   @{$res->{$PASS_XPASS}} = ();
+   @{$res->{$XPASS_PASS}} = ();
+   @{$res->{$XFAIL_PASS}} = ();
+   @{$res->{$XFAIL_XPASS}} = ();
+   @{$res->{$XFAIL_FAIL}} = ();
+   @{$res->{$FAIL_PASS}} = ();
+   @{$res->{$FAIL_XPASS}} = ();
    @{$res->{$PASSED_NOW_TIMEOUTS}} = ();
    @{$res->{$UNSUPPORTED_PASS}} = ();
    @{$res->{$UNSUPPORTED_XPASS}} = ();
@@ -520,14 +520,14 @@ sub print_compare_results_summary($$)
    }
 
    #### REGRESSIONS ?
-   $rtotal = scalar(@{$res->{$PASSED_NOW_FAILS}})
-       +scalar(@{$res->{$XPASS_NOW_FAIL}})
+   $rtotal = scalar(@{$res->{$PASS_FAIL}})
+       +scalar(@{$res->{$XPASS_FAIL}})
        +scalar(@{$res->{$PASS_DISAPPEARS}})
        +scalar(@{$res->{$XPASS_DISAPPEARS}})
        +scalar(@{$res->{$FAIL_APPEARS}})
        +scalar(@{$res->{$XPASS_APPEARS}})
-       +scalar(@{$res->{$PASS_NOW_XPASS}})
-       +scalar(@{$res->{$XFAIL_NOW_FAIL}})
+       +scalar(@{$res->{$PASS_XPASS}})
+       +scalar(@{$res->{$XFAIL_FAIL}})
        +scalar(@{$res->{$XFAIL_DISAPPEARS}})
        +scalar(@{$res->{$UNSUPPORTED_FAIL}})
        +scalar(@{$res->{$UNSUPPORTED_XPASS}})
@@ -544,14 +544,14 @@ sub print_compare_results_summary($$)
    {
        printf "\n$col_red"."o  REGRESSIONS:\n";
        printf "  +------------------------------------------+---------+\n";
-       printf "  | %-40s | %7d |\n", $PASSED_NOW_FAILS, scalar(@{$res->{$PASSED_NOW_FAILS}}) if (scalar(@{$res->{$PASSED_NOW_FAILS}}));
-       printf "  | %-40s | %7d |\n", $XPASS_NOW_FAIL, scalar(@{$res->{$XPASS_NOW_FAIL}}) if (scalar(@{$res->{$XPASS_NOW_FAIL}}));
+       printf "  | %-40s | %7d |\n", $PASS_FAIL, scalar(@{$res->{$PASS_FAIL}}) if (scalar(@{$res->{$PASS_FAIL}}));
+       printf "  | %-40s | %7d |\n", $XPASS_FAIL, scalar(@{$res->{$XPASS_FAIL}}) if (scalar(@{$res->{$XPASS_FAIL}}));
        printf "  | %-40s | %7d |\n", $PASS_DISAPPEARS, scalar(@{$res->{$PASS_DISAPPEARS}}) if (scalar(@{$res->{$PASS_DISAPPEARS}}));
        printf "  | %-40s | %7d |\n", $XPASS_DISAPPEARS, scalar(@{$res->{$XPASS_DISAPPEARS}}) if (scalar(@{$res->{$XPASS_DISAPPEARS}}));
        printf "  | %-40s | %7d |\n", $FAIL_APPEARS, scalar(@{$res->{$FAIL_APPEARS}}) if (scalar(@{$res->{$FAIL_APPEARS}}));
        printf "  | %-40s | %7d |\n", $XPASS_APPEARS, scalar(@{$res->{$XPASS_APPEARS}}) if (scalar(@{$res->{$XPASS_APPEARS}}));
-       printf "  | %-40s | %7d |\n", $PASS_NOW_XPASS, scalar(@{$res->{$PASS_NOW_XPASS}}) if (scalar(@{$res->{$PASS_NOW_XPASS}}));
-       printf "  | %-40s | %7d |\n", $XFAIL_NOW_FAIL, scalar(@{$res->{$XFAIL_NOW_FAIL}}) if (scalar(@{$res->{$XFAIL_NOW_FAIL}}));
+       printf "  | %-40s | %7d |\n", $PASS_XPASS, scalar(@{$res->{$PASS_XPASS}}) if (scalar(@{$res->{$PASS_XPASS}}));
+       printf "  | %-40s | %7d |\n", $XFAIL_FAIL, scalar(@{$res->{$XFAIL_FAIL}}) if (scalar(@{$res->{$XFAIL_FAIL}}));
        printf "  | %-40s | %7d |\n", $XFAIL_DISAPPEARS, scalar(@{$res->{$XFAIL_DISAPPEARS}}) if (scalar(@{$res->{$XFAIL_DISAPPEARS}}));
        printf "  | %-40s | %7d |\n", $UNSUPPORTED_FAIL, scalar(@{$res->{$UNSUPPORTED_FAIL}}) if (scalar(@{$res->{$UNSUPPORTED_FAIL}}));
        printf "  | %-40s | %7d |\n", $UNSUPPORTED_XPASS, scalar(@{$res->{$UNSUPPORTED_XPASS}}) if (scalar(@{$res->{$UNSUPPORTED_XPASS}}));
@@ -568,14 +568,14 @@ sub print_compare_results_summary($$)
 
        if ($long)
        {
-	      print_tclist($PASSED_NOW_FAILS, @{$res->{$PASSED_NOW_FAILS}});
-	      print_tclist($XPASS_NOW_FAIL, @{$res->{$XPASS_NOW_FAIL}});
+	      print_tclist($PASS_FAIL, @{$res->{$PASS_FAIL}});
+	      print_tclist($XPASS_FAIL, @{$res->{$XPASS_FAIL}});
 	      print_tclist($PASS_DISAPPEARS, @{$res->{$PASS_DISAPPEARS}});
 	      print_tclist($XPASS_DISAPPEARS, @{$res->{$XPASS_DISAPPEARS}});
 	      print_tclist($FAIL_APPEARS, @{$res->{$FAIL_APPEARS}});
 	      print_tclist($XPASS_APPEARS, @{$res->{$XPASS_APPEARS}});
-	      print_tclist($PASS_NOW_XPASS, @{$res->{$PASS_NOW_XPASS}});
-	      print_tclist($XFAIL_NOW_FAIL, @{$res->{$XFAIL_NOW_FAIL}});
+	      print_tclist($PASS_XPASS, @{$res->{$PASS_XPASS}});
+	      print_tclist($XFAIL_FAIL, @{$res->{$XFAIL_FAIL}});
 	      print_tclist($XFAIL_DISAPPEARS, @{$res->{$XFAIL_DISAPPEARS}});
 	      print_tclist($UNSUPPORTED_FAIL, @{$res->{$UNSUPPORTED_FAIL}});
 	      print_tclist($UNSUPPORTED_XPASS, @{$res->{$UNSUPPORTED_XPASS}});
@@ -592,17 +592,17 @@ sub print_compare_results_summary($$)
    #### MINOR TO BE CHECKED ?
    if (not $quiet and not $short)
    {
-       $total_better = scalar(@{$res->{$XPASS_NOW_PASSES}})+
-	   scalar(@{$res->{$XFAIL_NOW_PASSES}})+
-	   scalar(@{$res->{$XFAIL_NOW_XPASS}})+
-	   scalar(@{$res->{$FAIL_NOW_PASSES}})+
-	   scalar(@{$res->{$FAIL_NOW_XPASS}})+
+       $total_better = scalar(@{$res->{$XPASS_PASS}})+
+	   scalar(@{$res->{$XFAIL_PASS}})+
+	   scalar(@{$res->{$XFAIL_XPASS}})+
+	   scalar(@{$res->{$FAIL_PASS}})+
+	   scalar(@{$res->{$FAIL_XPASS}})+
 	   scalar(@{$res->{$NEW_PASSES}})+
 	   scalar(@{$res->{$FAIL_DISAPPEARS}})+
 	   scalar(@{$res->{$XFAIL_APPEARS}})+
-	   scalar(@{$res->{$FAIL_NOW_XFAIL}})+
-	   scalar(@{$res->{$PASS_NOW_XFAIL}})+
-	   scalar(@{$res->{$XPASS_NOW_XFAIL}})+
+	   scalar(@{$res->{$FAIL_XFAIL}})+
+	   scalar(@{$res->{$PASS_XFAIL}})+
+	   scalar(@{$res->{$XPASS_XFAIL}})+
 	   scalar(@{$res->{$UNSUPPORTED_PASS}})+
 	   scalar(@{$res->{$UNSUPPORTED_XFAIL}})+
 	   scalar(@{$res->{$UNSUPPORTED_DISAPPEARS}})+
@@ -619,15 +619,15 @@ sub print_compare_results_summary($$)
        printf "$col_pink"."o  MINOR TO BE CHECKED:\n";
        printf "  +------------------------------------------+---------+\n";
        printf "  | %-40s | %7d |\n", $XFAIL_APPEARS, scalar(@{$res->{$XFAIL_APPEARS}}) if (scalar(@{$res->{$XFAIL_APPEARS}}));
-       printf "  | %-40s | %7d |\n", $FAIL_NOW_XFAIL, scalar(@{$res->{$FAIL_NOW_XFAIL}}) if (scalar(@{$res->{$FAIL_NOW_XFAIL}}));
-       printf "  | %-40s | %7d |\n", $PASS_NOW_XFAIL, scalar(@{$res->{$PASS_NOW_XFAIL}}) if (scalar(@{$res->{$PASS_NOW_XFAIL}}));
-       printf "  | %-40s | %7d |\n", $XPASS_NOW_XFAIL, scalar(@{$res->{$XPASS_NOW_XFAIL}}) if (scalar(@{$res->{$XPASS_NOW_XFAIL}}));
+       printf "  | %-40s | %7d |\n", $FAIL_XFAIL, scalar(@{$res->{$FAIL_XFAIL}}) if (scalar(@{$res->{$FAIL_XFAIL}}));
+       printf "  | %-40s | %7d |\n", $PASS_XFAIL, scalar(@{$res->{$PASS_XFAIL}}) if (scalar(@{$res->{$PASS_XFAIL}}));
+       printf "  | %-40s | %7d |\n", $XPASS_XFAIL, scalar(@{$res->{$XPASS_XFAIL}}) if (scalar(@{$res->{$XPASS_XFAIL}}));
        printf "  | %-40s | %7d |\n", $FAIL_DISAPPEARS, scalar(@{$res->{$FAIL_DISAPPEARS}}) if (scalar(@{$res->{$FAIL_DISAPPEARS}}));
-       printf "  | %-40s | %7d |\n", $XPASS_NOW_PASSES, scalar(@{$res->{$XPASS_NOW_PASSES}}) if (scalar(@{$res->{$XPASS_NOW_PASSES}}));
-       printf "  | %-40s | %7d |\n", $XFAIL_NOW_PASSES, scalar(@{$res->{$XFAIL_NOW_PASSES}}) if (scalar(@{$res->{$XFAIL_NOW_PASSES}}));
-       printf "  | %-40s | %7d |\n", $XFAIL_NOW_XPASS, scalar(@{$res->{$XFAIL_NOW_XPASS}}) if (scalar(@{$res->{$XFAIL_NOW_XPASS}}));
-       printf "  | %-40s | %7d |\n", $FAIL_NOW_PASSES, scalar(@{$res->{$FAIL_NOW_PASSES}}) if (scalar(@{$res->{$FAIL_NOW_PASSES}}));
-       printf "  | %-40s | %7d |\n", $FAIL_NOW_XPASS, scalar(@{$res->{$FAIL_NOW_XPASS}}) if (scalar(@{$res->{$FAIL_NOW_XPASS}}));
+       printf "  | %-40s | %7d |\n", $XPASS_PASS, scalar(@{$res->{$XPASS_PASS}}) if (scalar(@{$res->{$XPASS_PASS}}));
+       printf "  | %-40s | %7d |\n", $XFAIL_PASS, scalar(@{$res->{$XFAIL_PASS}}) if (scalar(@{$res->{$XFAIL_PASS}}));
+       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", $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}}));
@@ -649,16 +649,16 @@ sub print_compare_results_summary($$)
 
        if ($long)
        {
-	      print_tclist($XPASS_NOW_PASSES, @{$res->{$XPASS_NOW_PASSES}});
-	      print_tclist($XFAIL_NOW_PASSES, @{$res->{$XFAIL_NOW_PASSES}});
-	      print_tclist($XFAIL_NOW_XPASS, @{$res->{$XFAIL_NOW_XPASS}});
-	      print_tclist($FAIL_NOW_PASSES, @{$res->{$FAIL_NOW_PASSES}});
-	      print_tclist($FAIL_NOW_XPASS, @{$res->{$FAIL_NOW_XPASS}});
+	      print_tclist($XPASS_PASS, @{$res->{$XPASS_PASS}});
+	      print_tclist($XFAIL_PASS, @{$res->{$XFAIL_PASS}});
+	      print_tclist($XFAIL_XPASS, @{$res->{$XFAIL_XPASS}});
+	      print_tclist($FAIL_PASS, @{$res->{$FAIL_PASS}});
+	      print_tclist($FAIL_XPASS, @{$res->{$FAIL_XPASS}});
 	      print_tclist($FAIL_DISAPPEARS, @{$res->{$FAIL_DISAPPEARS}});
 	      print_tclist($XFAIL_APPEARS, @{$res->{$XFAIL_APPEARS}});
-	      print_tclist($FAIL_NOW_XFAIL, @{$res->{$FAIL_NOW_XFAIL}});
-	      print_tclist($PASS_NOW_XFAIL, @{$res->{$PASS_NOW_XFAIL}});
-	      print_tclist($XPASS_NOW_XFAIL, @{$res->{$XPASS_NOW_XFAIL}});
+	      print_tclist($FAIL_XFAIL, @{$res->{$FAIL_XFAIL}});
+	      print_tclist($PASS_XFAIL, @{$res->{$PASS_XFAIL}});
+	      print_tclist($XPASS_XFAIL, @{$res->{$XPASS_XFAIL}});
 	      print_tclist($UNHANDLED_CASES, @{$res->{$UNHANDLED_CASES}});
 	      print_tclist($UNSUPPORTED_PASS, @{$res->{$UNSUPPORTED_PASS}});
 	      print_tclist($UNSUPPORTED_XFAIL, @{$res->{$UNSUPPORTED_XFAIL}});