compare_dg_tests.pl: Stop counting "XFAIL disappears" as a regression.

This has the same rationale as the "PASS disappears" case.

Change-Id: I8e6230dfa74064a1351c1b76f4e609b1c94e88b7

3 files changed, 15 insertions, 15 deletions

diff --git a/compare_dg_tests.pl b/compare_dg_tests.pl
index 05acb44..bcabae4 100755
--- a/compare_dg_tests.pl
+++ b/compare_dg_tests.pl
@@ -681,7 +681,6 @@ sub print_compare_results_summary($$)
        +scalar(@{$res->{$FAIL_APPEARS}})
        +scalar(@{$res->{$FAIL_UNRESOLVED}})
        +scalar(@{$res->{$XFAIL_FAIL}})
-       +scalar(@{$res->{$XFAIL_DISAPPEARS}})
        +scalar(@{$res->{$XFAIL_UNRESOLVED}})
        +scalar(@{$res->{$UNSUPPORTED_FAIL}})
        +scalar(@{$res->{$UNSUPPORTED_XPASS}})
@@ -711,7 +710,6 @@ sub print_compare_results_summary($$)
        printf "  | %-40s | %7d |\n", $FAIL_APPEARS, scalar(@{$res->{$FAIL_APPEARS}}) if (scalar(@{$res->{$FAIL_APPEARS}}));
        printf "  | %-40s | %7d |\n", $FAIL_UNRESOLVED, scalar(@{$res->{$FAIL_UNRESOLVED}}) if (scalar(@{$res->{$FAIL_UNRESOLVED}}));
        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", $XFAIL_UNRESOLVED, scalar(@{$res->{$XFAIL_UNRESOLVED}}) if (scalar(@{$res->{$XFAIL_UNRESOLVED}}));
        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}}));
@@ -740,7 +738,6 @@ sub print_compare_results_summary($$)
 	      print_tclist($res, $FAIL_APPEARS, @{$res->{$FAIL_APPEARS}});
 	      print_tclist($res, $FAIL_UNRESOLVED, @{$res->{$FAIL_UNRESOLVED}});
 	      print_tclist($res, $XFAIL_FAIL, @{$res->{$XFAIL_FAIL}});
-	      print_tclist($res, $XFAIL_DISAPPEARS, @{$res->{$XFAIL_DISAPPEARS}});
 	      print_tclist($res, $XFAIL_UNRESOLVED, @{$res->{$XFAIL_UNRESOLVED}});
 	      print_tclist($res, $UNSUPPORTED_FAIL, @{$res->{$UNSUPPORTED_FAIL}});
 	      print_tclist($res, $UNSUPPORTED_XPASS, @{$res->{$UNSUPPORTED_XPASS}});
@@ -775,6 +772,7 @@ sub print_compare_results_summary($$)
 	   scalar(@{$res->{$FAIL_UNSUPPORTED}})+
 	   scalar(@{$res->{$FAIL_UNTESTED}})+
 	   scalar(@{$res->{$FAIL_DISAPPEARS}})+
+	   scalar(@{$res->{$XFAIL_DISAPPEARS}})+
 	   scalar(@{$res->{$XFAIL_PASS}})+
 	   scalar(@{$res->{$XFAIL_XPASS}})+
 	   scalar(@{$res->{$XFAIL_UNSUPPORTED}})+
@@ -816,6 +814,7 @@ sub print_compare_results_summary($$)
        printf "  | %-40s | %7d |\n", $FAIL_UNSUPPORTED, scalar(@{$res->{$FAIL_UNSUPPORTED}}) if (scalar(@{$res->{$FAIL_UNSUPPORTED}}));
        printf "  | %-40s | %7d |\n", $FAIL_UNTESTED, scalar(@{$res->{$FAIL_UNTESTED}}) if (scalar(@{$res->{$FAIL_UNTESTED}}));
        printf "  | %-40s | %7d |\n", $FAIL_DISAPPEARS, scalar(@{$res->{$FAIL_DISAPPEARS}}) if (scalar(@{$res->{$FAIL_DISAPPEARS}}));
+       printf "  | %-40s | %7d |\n", $XFAIL_DISAPPEARS, scalar(@{$res->{$XFAIL_DISAPPEARS}}) if (scalar(@{$res->{$XFAIL_DISAPPEARS}}));
        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", $XFAIL_UNSUPPORTED, scalar(@{$res->{$XFAIL_UNSUPPORTED}}) if (scalar(@{$res->{$XFAIL_UNSUPPORTED}}));
@@ -865,6 +864,7 @@ sub print_compare_results_summary($$)
 	      print_tclist($res, $FAIL_UNSUPPORTED, @{$res->{$FAIL_UNSUPPORTED}});
 	      print_tclist($res, $FAIL_UNTESTED, @{$res->{$FAIL_UNTESTED}});
 	      print_tclist($res, $FAIL_DISAPPEARS, @{$res->{$FAIL_DISAPPEARS}});
+	      print_tclist($res, $XFAIL_DISAPPEARS, @{$res->{$XFAIL_DISAPPEARS}});
 	      print_tclist($res, $XFAIL_PASS, @{$res->{$XFAIL_PASS}});
 	      print_tclist($res, $XFAIL_XPASS, @{$res->{$XFAIL_XPASS}});
 	      print_tclist($res, $XFAIL_UNSUPPORTED, @{$res->{$XFAIL_UNSUPPORTED}});
diff --git a/testsuite/expected-1-2-long.txt b/testsuite/expected-1-2-long.txt
index 60cf911..995d529 100644
--- a/testsuite/expected-1-2-long.txt
+++ b/testsuite/expected-1-2-long.txt
@@ -34,7 +34,6 @@ o  REGRESSIONS:
   | FAIL appears              [     => FAIL] |       1 |
   | FAIL now UNRESOLVED       [FAIL =>UNRES] |       1 |
   | XFAIL now FAIL            [XFAIL=> FAIL] |       1 |
-  | XFAIL disappears          [XFAIL=>     ] |       1 |
   | XFAIL now UNRESOLVED      [XFAIL=>UNRES] |       1 |
   | UNSUPPORTED now FAIL      [UNSUP=> FAIL] |       1 |
   | UNSUPPORTED now XPASS     [UNSUP=>XPASS] |       1 |
@@ -46,7 +45,7 @@ o  REGRESSIONS:
   | UNRESOLVED now XPASS      [UNRES=>XPASS] |       1 |
   | UNRESOLVED appears        [     =>UNRES] |       1 |
   +------------------------------------------+---------+
-  | TOTAL_REGRESSIONS                        |      24 |
+  | TOTAL_REGRESSIONS                        |      23 |
   +------------------------------------------+---------+
 
   - PASS now XPASS            [PASS =>XPASS]:
@@ -115,12 +114,6 @@ o  REGRESSIONS:
     test3-xfail-fail
 
 
-  - XFAIL disappears          [XFAIL=>     ]:
-
-  Executed from: tests-4.exp
-    test5-xfail-disappears
-
-
   - XFAIL now UNRESOLVED      [XFAIL=>UNRES]:
 
   Executed from: tests-4.exp
@@ -200,6 +193,7 @@ o  MINOR TO BE CHECKED:
   | FAIL now UNSUPPORTED      [FAIL =>UNSUP] |       1 |
   | FAIL now UNTESTED         [FAIL =>UNTES] |       1 |
   | FAIL disappears           [FAIL =>     ] |       1 |
+  | XFAIL disappears          [XFAIL=>     ] |       1 |
   | XFAIL now PASS            [XFAIL=> PASS] |       1 |
   | XFAIL now XPASS           [XFAIL=>XPASS] |       1 |
   | XFAIL now UNSUPPORTED     [XFAIL=>UNSUP] |       1 |
@@ -223,7 +217,7 @@ o  MINOR TO BE CHECKED:
   | ERROR disappears          [ERROR=>     ] |       1 |
   | HW dependent cases        [HW-DEPENDENT] |       2 |
   +------------------------------------------+---------+
-  | TOTAL_MINOR_TO_BE_CHECKED                |      40 |
+  | TOTAL_MINOR_TO_BE_CHECKED                |      41 |
   +------------------------------------------+---------+
 
   - PASS disappears           [PASS =>     ]:
@@ -340,6 +334,12 @@ o  MINOR TO BE CHECKED:
     test5-fail-disappears
 
 
+  - XFAIL disappears          [XFAIL=>     ]:
+
+  Executed from: tests-4.exp
+    test5-xfail-disappears
+
+
   - XFAIL now PASS            [XFAIL=> PASS]:
 
   Executed from: tests-4.exp
diff --git a/testsuite/expected-1-2.txt b/testsuite/expected-1-2.txt
index 858635c..3e6ac73 100644
--- a/testsuite/expected-1-2.txt
+++ b/testsuite/expected-1-2.txt
@@ -34,7 +34,6 @@ o  REGRESSIONS:
   | FAIL appears              [     => FAIL] |       1 |
   | FAIL now UNRESOLVED       [FAIL =>UNRES] |       1 |
   | XFAIL now FAIL            [XFAIL=> FAIL] |       1 |
-  | XFAIL disappears          [XFAIL=>     ] |       1 |
   | XFAIL now UNRESOLVED      [XFAIL=>UNRES] |       1 |
   | UNSUPPORTED now FAIL      [UNSUP=> FAIL] |       1 |
   | UNSUPPORTED now XPASS     [UNSUP=>XPASS] |       1 |
@@ -46,7 +45,7 @@ o  REGRESSIONS:
   | UNRESOLVED now XPASS      [UNRES=>XPASS] |       1 |
   | UNRESOLVED appears        [     =>UNRES] |       1 |
   +------------------------------------------+---------+
-  | TOTAL_REGRESSIONS                        |      24 |
+  | TOTAL_REGRESSIONS                        |      23 |
   +------------------------------------------+---------+
 
 
@@ -68,6 +67,7 @@ o  MINOR TO BE CHECKED:
   | FAIL now UNSUPPORTED      [FAIL =>UNSUP] |       1 |
   | FAIL now UNTESTED         [FAIL =>UNTES] |       1 |
   | FAIL disappears           [FAIL =>     ] |       1 |
+  | XFAIL disappears          [XFAIL=>     ] |       1 |
   | XFAIL now PASS            [XFAIL=> PASS] |       1 |
   | XFAIL now XPASS           [XFAIL=>XPASS] |       1 |
   | XFAIL now UNSUPPORTED     [XFAIL=>UNSUP] |       1 |
@@ -91,7 +91,7 @@ o  MINOR TO BE CHECKED:
   | ERROR disappears          [ERROR=>     ] |       1 |
   | HW dependent cases        [HW-DEPENDENT] |       2 |
   +------------------------------------------+---------+
-  | TOTAL_MINOR_TO_BE_CHECKED                |      40 |
+  | TOTAL_MINOR_TO_BE_CHECKED                |      41 |
   +------------------------------------------+---------+