compare_dg_tests.pl: Reorder initializations for easier readability.

Change-Id: I1d6572f73ebb4cef38b3da140643e0afbdaa3edc

1 files changed, 42 insertions, 35 deletions

diff --git a/compare_dg_tests.pl b/compare_dg_tests.pl
index fc4e544..1b19687 100755
--- a/compare_dg_tests.pl
+++ b/compare_dg_tests.pl
@@ -74,29 +74,30 @@ my $UNSTABLE_CASES	  = "Unstable cases, ignored   [~RANDOM     ]";
 my @handler_list = (
   {was=>"PASS",     is=>"PASS",     cat=>$PASS_PASS},
   {was=>"PASS",     is=>"XPASS",    cat=>$PASS_XPASS},
+  {was=>"PASS",     is=>"FAIL",     handler=>\&handle_pass_fail},
+  {was=>"PASS",     is=>"XFAIL",    cat=>$PASS_XFAIL},
+  {was=>"PASS",     is=>"NO_EXIST", cat=>$PASS_DISAPPEARS},
+  {was=>"NO_EXIST", is=>"PASS",     cat=>$PASS_APPEARS},
+
   {was=>"XPASS",    is=>"PASS",     cat=>$XPASS_PASS},
   {was=>"XPASS",    is=>"XPASS",    cat=>$XPASS_XPASS},
+  {was=>"XPASS",    is=>"FAIL",     cat=>$XPASS_FAIL},
+  {was=>"XPASS",    is=>"XFAIL",    cat=>$XPASS_XFAIL},
+  {was=>"XPASS",    is=>"NO_EXIST", cat=>$XPASS_DISAPPEARS},
+  {was=>"NO_EXIST", is=>"XPASS",    cat=>$XPASS_APPEARS},
+
+  {was=>"FAIL",     is=>"PASS",     cat=>$FAIL_PASS},
+  {was=>"FAIL",     is=>"XPASS",    cat=>$FAIL_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=>"NO_EXIST", is=>"FAIL",     cat=>$FAIL_APPEARS},
+
   {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=>$PASS_APPEARS},
-  {was=>"NO_EXIST", is=>"XPASS",    cat=>$XPASS_APPEARS},
-
-  {was=>"PASS",     is=>"FAIL",     handler=>\&handle_pass_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},
+  {was=>"XFAIL",    is=>"FAIL",     cat=>$XFAIL_FAIL},
+  {was=>"XFAIL",    is=>"XFAIL",    cat=>$XFAIL_XFAIL},
+  {was=>"XFAIL",    is=>"NO_EXIST", cat=>$XFAIL_DISAPPEARS},
   {was=>"NO_EXIST", is=>"XFAIL",    cat=>$XFAIL_APPEARS},
 
   {was=>"UNSUPPORTED", is=>"PASS", cat=>$UNSUPPORTED_PASS},
@@ -104,22 +105,21 @@ my @handler_list = (
   {was=>"UNSUPPORTED", is=>"FAIL", cat=>$UNSUPPORTED_FAIL},
   {was=>"UNSUPPORTED", is=>"XFAIL", cat=>$UNSUPPORTED_XFAIL},
   {was=>"UNSUPPORTED", is=>"NO_EXIST", cat=>$UNSUPPORTED_DISAPPEARS},
+  {was=>"NO_EXIST", is=>"UNSUPPORTED", cat=>$UNSUPPORTED_APPEARS},
 
   {was=>"UNTESTED", is=>"PASS", cat=>$UNTESTED_PASS},
   {was=>"UNTESTED", is=>"XPASS", cat=>$UNTESTED_XPASS},
   {was=>"UNTESTED", is=>"FAIL", cat=>$UNTESTED_FAIL},
   {was=>"UNTESTED", is=>"XFAIL", cat=>$UNTESTED_XFAIL},
   {was=>"UNTESTED", is=>"NO_EXIST", cat=>$UNTESTED_DISAPPEARS},
+  {was=>"NO_EXIST", is=>"UNTESTED",    cat=>$UNTESTED_APPEARS},
 
   {was=>"UNRESOLVED", is=>"PASS", cat=>$UNRESOLVED_PASS},
   {was=>"UNRESOLVED", is=>"XPASS", cat=>$UNRESOLVED_XPASS},
   {was=>"UNRESOLVED", is=>"FAIL", cat=>$UNRESOLVED_FAIL},
   {was=>"UNRESOLVED", is=>"XFAIL", cat=>$UNRESOLVED_XFAIL},
   {was=>"UNRESOLVED", is=>"NO_EXIST", cat=>$UNRESOLVED_DISAPPEARS},
-
   {was=>"NO_EXIST", is=>"UNRESOLVED",  cat=>$UNRESOLVED_APPEARS},
-  {was=>"NO_EXIST", is=>"UNTESTED",    cat=>$UNTESTED_APPEARS},
-  {was=>"NO_EXIST", is=>"UNSUPPORTED", cat=>$UNSUPPORTED_APPEARS},
 
 #  {was=>"NO_EXIST", is=>"NO_EXIST", handler=>\&handle_not_yet_supported}
 );
@@ -312,48 +312,55 @@ sub compare_results($$)
    my ($ref, $res) = @_;
 
    @{$res->{$PASS_PASS}} = ();
-   @{$res->{$FAIL_FAIL}} = ();
-   @{$res->{$XPASS_XPASS}} = ();
+   @{$res->{$PASS_XPASS}} = ();
    @{$res->{$PASS_FAIL}} = ();
-   @{$res->{$XPASS_FAIL}} = ();
+   @{$res->{$PASS_XFAIL}} = ();
    @{$res->{$PASS_DISAPPEARS}} = ();
-   @{$res->{$XPASS_DISAPPEARS}} = ();
-   @{$res->{$FAIL_APPEARS}} = ();
-   @{$res->{$XPASS_APPEARS}} = ();
    @{$res->{$PASS_APPEARS}} = ();
-   @{$res->{$FAIL_DISAPPEARS}} = ();
-   @{$res->{$XFAIL_DISAPPEARS}} = ();
-   @{$res->{$XFAIL_APPEARS}} = ();
-   @{$res->{$FAIL_XFAIL}} = ();
-   @{$res->{$PASS_XFAIL}} = ();
+   @{$res->{$PASSED_NOW_TIMEOUTS}} = ();
+
+   @{$res->{$XPASS_PASS}} = ();
+   @{$res->{$XPASS_XPASS}} = ();
+   @{$res->{$XPASS_FAIL}} = ();
    @{$res->{$XPASS_XFAIL}} = ();
+   @{$res->{$XPASS_DISAPPEARS}} = ();
    @{$res->{$XPASS_APPEARS}} = ();
-   @{$res->{$PASS_XPASS}} = ();
-   @{$res->{$XPASS_PASS}} = ();
+
+   @{$res->{$FAIL_PASS}} = ();
+   @{$res->{$FAIL_XPASS}} = ();
+   @{$res->{$FAIL_FAIL}} = ();
+   @{$res->{$FAIL_XFAIL}} = ();
+   @{$res->{$FAIL_DISAPPEARS}} = ();
+   @{$res->{$FAIL_APPEARS}} = ();
+
    @{$res->{$XFAIL_PASS}} = ();
    @{$res->{$XFAIL_XPASS}} = ();
    @{$res->{$XFAIL_FAIL}} = ();
-   @{$res->{$FAIL_PASS}} = ();
-   @{$res->{$FAIL_XPASS}} = ();
-   @{$res->{$PASSED_NOW_TIMEOUTS}} = ();
+   @{$res->{$XFAIL_XFAIL}} = ();
+   @{$res->{$XFAIL_DISAPPEARS}} = ();
+   @{$res->{$XFAIL_APPEARS}} = ();
+
    @{$res->{$UNSUPPORTED_PASS}} = ();
    @{$res->{$UNSUPPORTED_XPASS}} = ();
    @{$res->{$UNSUPPORTED_FAIL}} = ();
    @{$res->{$UNSUPPORTED_XFAIL}} = ();
    @{$res->{$UNSUPPORTED_DISAPPEARS}} = ();
    @{$res->{$UNSUPPORTED_APPEARS}} = ();
+
    @{$res->{$UNTESTED_PASS}} = ();
    @{$res->{$UNTESTED_XPASS}} = ();
    @{$res->{$UNTESTED_FAIL}} = ();
    @{$res->{$UNTESTED_XFAIL}} = ();
    @{$res->{$UNTESTED_DISAPPEARS}} = ();
    @{$res->{$UNTESTED_APPEARS}} = ();
+
    @{$res->{$UNRESOLVED_PASS}} = ();
    @{$res->{$UNRESOLVED_XPASS}} = ();
    @{$res->{$UNRESOLVED_FAIL}} = ();
    @{$res->{$UNRESOLVED_XFAIL}} = ();
    @{$res->{$UNRESOLVED_DISAPPEARS}} = ();
    @{$res->{$UNRESOLVED_APPEARS}} = ();
+
    @{$res->{$UNHANDLED_CASES}} = ();
    @{$res->{$UNSTABLE_CASES}} = ();