diff options
| author | Christophe Lyon <christophe.lyon@linaro.org> | 2018-11-30 15:33:20 +0000 |
|---|---|---|
| committer | Christophe Lyon <christophe.lyon@linaro.org> | 2018-11-30 15:33:20 +0000 |
| commit | 300378363a38eb19ccb8aaf764fe0702e9aa244d (patch) | |
| tree | 6d6fb1bb776583adf951e4cdd1db3651be5b74da | |
| parent | 3b675e8a3063d5735731208c2f81e510eabd8580 (diff) | |
compare_dg_tests.dl: Remove duplicate info.
In the detailed report, we listed XFAIL->PASS and XFAIL-XPASS twice,
this patch removes this duplication.
Also change the addition order when computing $rtotal, to match the
output order (easier to read/maintain).
Change-Id: I40a98e0ef0502979a12034feebdbf1ca34f2330b
| -rwxr-xr-x | compare_dg_tests.pl | 6 | ||||
| -rw-r--r-- | testsuite/expected-1-2-long.txt | 12 |
2 files changed, 2 insertions, 16 deletions
diff --git a/compare_dg_tests.pl b/compare_dg_tests.pl index bcabae4..35245b1 100755 --- a/compare_dg_tests.pl +++ b/compare_dg_tests.pl @@ -675,6 +675,7 @@ sub print_compare_results_summary($$) +scalar(@{$res->{$PASS_FAIL}}) +scalar(@{$res->{$PASS_UNRESOLVED}}) +scalar(@{$res->{$PASSED_NOW_TIMEOUTS}}) + +scalar(@{$res->{$ERROR_APPEARS}}) +scalar(@{$res->{$XPASS_FAIL}}) +scalar(@{$res->{$XPASS_APPEARS}}) +scalar(@{$res->{$XPASS_UNRESOLVED}}) @@ -690,8 +691,7 @@ sub print_compare_results_summary($$) +scalar(@{$res->{$UNTESTED_UNRESOLVED}}) +scalar(@{$res->{$UNRESOLVED_FAIL}}) +scalar(@{$res->{$UNRESOLVED_XPASS}}) - +scalar(@{$res->{$UNRESOLVED_APPEARS}}) - +scalar(@{$res->{$ERROR_APPEARS}}); + +scalar(@{$res->{$UNRESOLVED_APPEARS}}); $quiet_reg=1 if ($short and not $rtotal); @@ -856,8 +856,6 @@ sub print_compare_results_summary($$) print_tclist($res, $XPASS_UNSUPPORTED, @{$res->{$XPASS_UNSUPPORTED}}); print_tclist($res, $XPASS_UNTESTED, @{$res->{$XPASS_UNTESTED}}); print_tclist($res, $XPASS_DISAPPEARS, @{$res->{$XPASS_DISAPPEARS}}); - print_tclist($res, $XFAIL_PASS, @{$res->{$XFAIL_PASS}}); - print_tclist($res, $XFAIL_XPASS, @{$res->{$XFAIL_XPASS}}); print_tclist($res, $FAIL_PASS, @{$res->{$FAIL_PASS}}); print_tclist($res, $FAIL_XPASS, @{$res->{$FAIL_XPASS}}); print_tclist($res, $FAIL_XFAIL, @{$res->{$FAIL_XFAIL}}); diff --git a/testsuite/expected-1-2-long.txt b/testsuite/expected-1-2-long.txt index 995d529..217aabb 100644 --- a/testsuite/expected-1-2-long.txt +++ b/testsuite/expected-1-2-long.txt @@ -284,18 +284,6 @@ o MINOR TO BE CHECKED: test5-xpass-disappears - - XFAIL now PASS [XFAIL=> PASS]: - - Executed from: tests-4.exp - test1-xfail-pass - - - - XFAIL now XPASS [XFAIL=>XPASS]: - - Executed from: tests-4.exp - test2-xfail-xpass - - - FAIL now PASS [FAIL => PASS]: Executed from: tests-3.exp |