testsuite: Check that testsuite paths are correctly handled
compare_dg_tests.pl's read_sum() ignores the path of an exp file up to and
including the ".../testsuite/" directory. This isn't tested in the script's
testsuite though so do that here.
Change-Id: If52dddc48c4a6c3ebfbdfeda4f0d3a8cf665dbc8
diff --git a/testsuite/sum-1.txt b/testsuite/sum-1.txt
index 99b1dce..ee4b294 100644
--- a/testsuite/sum-1.txt
+++ b/testsuite/sum-1.txt
@@ -1,7 +1,7 @@
=== gcc-compare-results tests ===
Running target mytarget
-Running tests-1.exp ...
+Running /foo/bar/testsuite/tests-1.exp ...
PASS: test1-pass-pass
PASS: test2-pass-xpass
PASS: test3-pass-fail
@@ -12,7 +12,7 @@
PASS: test8-pass-unresolved
PASS: test9-pass-kfail
-Running tests-2.exp ...
+Running /foo/bar/testsuite/tests-2.exp ...
XPASS: test1-xpass-pass
XPASS: test2-xpass-xpass
XPASS: test3-xpass-fail
@@ -23,7 +23,7 @@
XPASS: test8-xpass-unresolved
XPASS: test9-xpass-kfail
-Running tests-3.exp ...
+Running /foo/bar/testsuite/tests-3.exp ...
FAIL: test1-fail-pass
FAIL: test2-fail-xpass
FAIL: test3-fail-fail
@@ -34,7 +34,7 @@
FAIL: test8-fail-unresolved
FAIL: test9-fail-kfail
-Running tests-4.exp ...
+Running /foo/bar/testsuite/tests-4.exp ...
XFAIL: test1-xfail-pass
XFAIL: test2-xfail-xpass
XFAIL: test3-xfail-fail
@@ -45,7 +45,7 @@
XFAIL: test8-xfail-unresolved
XFAIL: test9-xfail-kfail
-Running tests-5.exp ...
+Running /foo/bar/testsuite/tests-5.exp ...
UNSUPPORTED: test1-unsupported-pass
UNSUPPORTED: test2-unsupported-xpass
UNSUPPORTED: test3-unsupported-fail
@@ -56,7 +56,7 @@
UNSUPPORTED: test8-unsupported-unsupported
UNSUPPORTED: test9-unsupported-kfail
-Running tests-6.exp ...
+Running /foo/bar/testsuite/tests-6.exp ...
UNTESTED: test1-untested-pass
UNTESTED: test2-untested-xpass
UNTESTED: test3-untested-fail
@@ -67,7 +67,7 @@
UNTESTED: test8-untested-untested
UNTESTED: test9-untested-kfail
-Running tests-7.exp ...
+Running /foo/bar/testsuite/tests-7.exp ...
UNRESOLVED: test1-unresolved-pass
UNRESOLVED: test2-unresolved-xpass
UNRESOLVED: test3-unresolved-fail
@@ -78,16 +78,16 @@
UNRESOLVED: test8-unresolved-unresolved
UNRESOLVED: test9-unresolved-kfail
-Running tests-8.exp ...
+Running /foo/bar/testsuite/tests-8.exp ...
PASS: test1-pass-and-fails
FAIL: test1-pass-and-fails
-Running tests-9.exp ...
+Running /foo/bar/testsuite/tests-9.exp ...
FAIL: test1-fail-pass execution
ERROR: (DejaGnu) proc "scan-dump-tree-not fail_test optimized 1" does not exist.
-Running tests-10.exp ...
+Running /foo/bar/testsuite/tests-10.exp ...
KFAIL: test1-kfail-pass
KFAIL: test2-kfail-xpass
KFAIL: test3-kfail-fail
@@ -98,7 +98,7 @@
KFAIL: test8-kfail-unresolved
KFAIL: test9-kfail-kfail
-Running hw-dep.exp ...
+Running /foo/bar/testsuite/hw-dep.exp ...
PASS: test1-hwdep-pass-pass
PASS: test2-hwdep-pass-xpass
PASS: test3-hwdep-pass-fail
@@ -109,7 +109,7 @@
PASS: test8-hwdep-pass-unresolved
PASS: test9-hwdep-pass-kfail
-Running duplicate.exp ...
+Running /foo/bar/testsuite/duplicate.exp ...
PASS: test1-dup-pass-disappears
PASS: test1-dup-pass-disappears
PASS: test2-dup-pass-appears
diff --git a/testsuite/sum-2.txt b/testsuite/sum-2.txt
index 9f251ca..cbd2992 100644
--- a/testsuite/sum-2.txt
+++ b/testsuite/sum-2.txt
@@ -1,7 +1,7 @@
=== gcc-compare-results tests ===
Running target mytarget
-Running tests-1.exp ...
+Running /foo/bar/testsuite/tests-1.exp ...
PASS: test1-pass-pass
XPASS: test2-pass-xpass
FAIL: test3-pass-fail
@@ -11,7 +11,7 @@
UNRESOLVED: test8-pass-unresolved
KFAIL: test9-pass-kfail
-Running tests-2.exp ...
+Running /foo/bar/testsuite/tests-2.exp ...
PASS: test1-xpass-pass
XPASS: test2-xpass-xpass
FAIL: test3-xpass-fail
@@ -21,7 +21,7 @@
UNRESOLVED: test8-xpass-unresolved
KFAIL: test9-xpass-kfail
-Running tests-3.exp ...
+Running /foo/bar/testsuite/tests-3.exp ...
PASS: test1-fail-pass
XPASS: test2-fail-xpass
FAIL: test3-fail-fail
@@ -31,7 +31,7 @@
UNRESOLVED: test8-fail-unresolved
KFAIL: test9-fail-kfail
-Running tests-4.exp ...
+Running /foo/bar/testsuite/tests-4.exp ...
PASS: test1-xfail-pass
XPASS: test2-xfail-xpass
FAIL: test3-xfail-fail
@@ -41,14 +41,14 @@
UNRESOLVED: test8-xfail-unresolved
KFAIL: test9-xfail-kfail
-Running tests-appear.exp ...
+Running /foo/bar/testsuite/tests-appear.exp ...
PASS: test1-pass-appears
XPASS: test2-xpass-appears
FAIL: test3-fail-appears
XFAIL: test4-xfail-appears
KFAIL: test5-kfail-appears
-Running tests-5.exp ...
+Running /foo/bar/testsuite/tests-5.exp ...
PASS: test1-unsupported-pass
XPASS: test2-unsupported-xpass
FAIL: test3-unsupported-fail
@@ -58,7 +58,7 @@
UNSUPPORTED: test8-unsupported-unsupported
KFAIL: test9-unsupported-kfail
-Running tests-6.exp ...
+Running /foo/bar/testsuite/tests-6.exp ...
PASS: test1-untested-pass
XPASS: test2-untested-xpass
FAIL: test3-untested-fail
@@ -68,7 +68,7 @@
UNTESTED: test8-untested-untested
KFAIL: test9-untested-kfail
-Running tests-7.exp ...
+Running /foo/bar/testsuite/tests-7.exp ...
PASS: test1-unresolved-pass
XPASS: test2-unresolved-xpass
FAIL: test3-unresolved-fail
@@ -78,7 +78,7 @@
UNRESOLVED: test8-unresolved-unresolved
KFAIL: test9-unresolved-kfail
-Running tests-appear2.exp ...
+Running /foo/bar/testsuite/tests-appear2.exp ...
PASS: test1-pass-appears
XPASS: test2-xpass-appears
FAIL: test3-fail-appears
@@ -88,16 +88,16 @@
UNRESOLVED: test7-unresolved-appears
KFAIL: test8-kfail-appears
-Running tests-8.exp ...
+Running /foo/bar/testsuite/tests-8.exp ...
PASS: test1-pass-and-fails
FAIL: test1-pass-and-fails
-Running tests-9.exp ...
+Running /foo/bar/testsuite/tests-9.exp ...
PASS: test1-fail-pass execution
ERROR: (DejaGnu) proc "scan-dump-tree-not fail_test optimized 3" does not exist.
-Running tests-10.exp ...
+Running /foo/bar/testsuite/tests-10.exp ...
PASS: test1-kfail-pass
XPASS: test2-kfail-xpass
FAIL: test3-kfail-fail
@@ -107,7 +107,7 @@
UNRESOLVED: test8-kfail-unresolved
KFAIL: test9-kfail-kfail
-Running hw-dep.exp ...
+Running /foo/bar/testsuite/hw-dep.exp ...
PASS: test1-hwdep-pass-pass
XPASS: test2-hwdep-pass-xpass
FAIL: test3-hwdep-pass-fail
@@ -117,7 +117,7 @@
UNRESOLVED: test8-hwdep-pass-unresolved
KFAIL: test9-hwdep-pass-kfail
-Running duplicate.exp ...
+Running /foo/bar/testsuite/duplicate.exp ...
PASS: test1-dup-pass-disappears
PASS: test2-dup-pass-appears
PASS: test2-dup-pass-appears
diff --git a/testsuite/sum-merge-1.txt b/testsuite/sum-merge-1.txt
index 7bc957b..7c7b9c7 100644
--- a/testsuite/sum-merge-1.txt
+++ b/testsuite/sum-merge-1.txt
@@ -2,7 +2,7 @@
Running target mytarget
-Running tests-pass.exp ...
+Running /foo/bar/testsuite/tests-pass.exp ...
PASS: test-pass-pass-pass
PASS: test-pass-pass-xpass
PASS: test-pass-pass-fail
@@ -68,7 +68,7 @@
PASS: test-pass-unresolved-untested
PASS: test-pass-unresolved-unresolved
-Running tests-xpass.exp ...
+Running /foo/bar/testsuite/tests-xpass.exp ...
XPASS: test-xpass-pass-pass
XPASS: test-xpass-pass-xpass
XPASS: test-xpass-pass-fail
@@ -134,7 +134,7 @@
XPASS: test-xpass-unresolved-untested
XPASS: test-xpass-unresolved-unresolved
-Running tests-fail.exp ...
+Running /foo/bar/testsuite/tests-fail.exp ...
FAIL: test-fail-pass-pass
FAIL: test-fail-pass-xpass
FAIL: test-fail-pass-fail
@@ -201,7 +201,7 @@
FAIL: test-fail-unresolved-unresolved
FAIL: test-fail-absent-absent
-Running tests-xfail.exp ...
+Running /foo/bar/testsuite/tests-xfail.exp ...
XFAIL: test-xfail-pass-pass
XFAIL: test-xfail-pass-xpass
XFAIL: test-xfail-pass-fail
@@ -267,7 +267,7 @@
XFAIL: test-xfail-unresolved-untested
XFAIL: test-xfail-unresolved-unresolved
-Running tests-kfail.exp ...
+Running /foo/bar/testsuite/tests-kfail.exp ...
KFAIL: test-kfail-pass-pass
KFAIL: test-kfail-pass-xpass
KFAIL: test-kfail-pass-fail
@@ -333,7 +333,7 @@
KFAIL: test-kfail-unresolved-untested
KFAIL: test-kfail-unresolved-unresolved
-Running tests-unsupported.exp ...
+Running /foo/bar/testsuite/tests-unsupported.exp ...
UNSUPPORTED: test-unsupported-pass-pass
UNSUPPORTED: test-unsupported-pass-xpass
UNSUPPORTED: test-unsupported-pass-fail
@@ -399,7 +399,7 @@
UNSUPPORTED: test-unsupported-unresolved-untested
UNSUPPORTED: test-unsupported-unresolved-unresolved
-Running tests-untested.exp ...
+Running /foo/bar/testsuite/tests-untested.exp ...
UNTESTED: test-untested-pass-pass
UNTESTED: test-untested-pass-xpass
UNTESTED: test-untested-pass-fail
@@ -465,7 +465,7 @@
UNTESTED: test-untested-unresolved-untested
UNTESTED: test-untested-unresolved-unresolved
-Running tests-unresolved.exp ...
+Running /foo/bar/testsuite/tests-unresolved.exp ...
UNRESOLVED: test-unresolved-pass-pass
UNRESOLVED: test-unresolved-pass-xpass
UNRESOLVED: test-unresolved-pass-fail
@@ -531,7 +531,7 @@
UNRESOLVED: test-unresolved-unresolved-untested
UNRESOLVED: test-unresolved-unresolved-unresolved
-Running test-that-only-appears-in-sum-1.exp ...
+Running /foo/bar/testsuite/test-that-only-appears-in-sum-1.exp ...
FAIL: Test that this will appear in the merged sum file
=== gcc-compare-results Summary ===
diff --git a/testsuite/sum-merge-2.txt b/testsuite/sum-merge-2.txt
index f17e65f..5f77bf3 100644
--- a/testsuite/sum-merge-2.txt
+++ b/testsuite/sum-merge-2.txt
@@ -2,7 +2,7 @@
Running target mytarget
-Running tests-pass.exp ...
+Running /foo/bar/testsuite/tests-pass.exp ...
PASS: test-pass-pass-pass
PASS: test-pass-pass-xpass
PASS: test-pass-pass-fail
@@ -68,7 +68,7 @@
UNRESOLVED: test-pass-unresolved-untested
UNRESOLVED: test-pass-unresolved-unresolved
-Running tests-xpass.exp ...
+Running /foo/bar/testsuite/tests-xpass.exp ...
PASS: test-xpass-pass-pass
PASS: test-xpass-pass-xpass
PASS: test-xpass-pass-fail
@@ -134,7 +134,7 @@
UNRESOLVED: test-xpass-unresolved-untested
UNRESOLVED: test-xpass-unresolved-unresolved
-Running tests-fail.exp ...
+Running /foo/bar/testsuite/tests-fail.exp ...
PASS: test-fail-pass-pass
PASS: test-fail-pass-xpass
PASS: test-fail-pass-fail
@@ -201,7 +201,7 @@
UNRESOLVED: test-fail-unresolved-unresolved
FAIL: test-absent-fail-absent
-Running tests-xfail.exp ...
+Running /foo/bar/testsuite/tests-xfail.exp ...
PASS: test-xfail-pass-pass
PASS: test-xfail-pass-xpass
PASS: test-xfail-pass-fail
@@ -267,7 +267,7 @@
UNRESOLVED: test-xfail-unresolved-untested
UNRESOLVED: test-xfail-unresolved-unresolved
-Running tests-kfail.exp ...
+Running /foo/bar/testsuite/tests-kfail.exp ...
PASS: test-kfail-pass-pass
PASS: test-kfail-pass-xpass
PASS: test-kfail-pass-fail
@@ -333,7 +333,7 @@
UNRESOLVED: test-kfail-unresolved-untested
UNRESOLVED: test-kfail-unresolved-unresolved
-Running tests-unsupported.exp ...
+Running /foo/bar/testsuite/tests-unsupported.exp ...
PASS: test-unsupported-pass-pass
PASS: test-unsupported-pass-xpass
PASS: test-unsupported-pass-fail
@@ -399,7 +399,7 @@
UNRESOLVED: test-unsupported-unresolved-untested
UNRESOLVED: test-unsupported-unresolved-unresolved
-Running tests-untested.exp ...
+Running /foo/bar/testsuite/tests-untested.exp ...
PASS: test-untested-pass-pass
PASS: test-untested-pass-xpass
PASS: test-untested-pass-fail
@@ -465,7 +465,7 @@
UNRESOLVED: test-untested-unresolved-untested
UNRESOLVED: test-untested-unresolved-unresolved
-Running tests-unresolved.exp ...
+Running /foo/bar/testsuite/tests-unresolved.exp ...
PASS: test-unresolved-pass-pass
PASS: test-unresolved-pass-xpass
PASS: test-unresolved-pass-fail
diff --git a/testsuite/sum-merge-3.txt b/testsuite/sum-merge-3.txt
index d5d76ff..bc2b00a 100644
--- a/testsuite/sum-merge-3.txt
+++ b/testsuite/sum-merge-3.txt
@@ -2,7 +2,7 @@
Running target mytarget
-Running tests-pass.exp ...
+Running /foo/bar/testsuite/tests-pass.exp ...
PASS: test-pass-pass-pass
XPASS: test-pass-pass-xpass
FAIL: test-pass-pass-fail
@@ -68,7 +68,7 @@
UNTESTED: test-pass-unresolved-untested
UNRESOLVED: test-pass-unresolved-unresolved
-Running tests-xpass.exp ...
+Running /foo/bar/testsuite/tests-xpass.exp ...
PASS: test-xpass-pass-pass
XPASS: test-xpass-pass-xpass
FAIL: test-xpass-pass-fail
@@ -134,7 +134,7 @@
UNTESTED: test-xpass-unresolved-untested
UNRESOLVED: test-xpass-unresolved-unresolved
-Running tests-fail.exp ...
+Running /foo/bar/testsuite/tests-fail.exp ...
PASS: test-fail-pass-pass
XPASS: test-fail-pass-xpass
FAIL: test-fail-pass-fail
@@ -201,7 +201,7 @@
UNRESOLVED: test-fail-unresolved-unresolved
FAIL: test-absent-absent-fail
-Running tests-xfail.exp ...
+Running /foo/bar/testsuite/tests-xfail.exp ...
PASS: test-xfail-pass-pass
XPASS: test-xfail-pass-xpass
FAIL: test-xfail-pass-fail
@@ -267,7 +267,7 @@
UNTESTED: test-xfail-unresolved-untested
UNRESOLVED: test-xfail-unresolved-unresolved
-Running tests-kfail.exp ...
+Running /foo/bar/testsuite/tests-kfail.exp ...
PASS: test-kfail-pass-pass
XPASS: test-kfail-pass-xpass
FAIL: test-kfail-pass-fail
@@ -333,7 +333,7 @@
UNTESTED: test-kfail-unresolved-untested
UNRESOLVED: test-kfail-unresolved-unresolved
-Running tests-unsupported.exp ...
+Running /foo/bar/testsuite/tests-unsupported.exp ...
PASS: test-unsupported-pass-pass
XPASS: test-unsupported-pass-xpass
FAIL: test-unsupported-pass-fail
@@ -399,7 +399,7 @@
UNTESTED: test-unsupported-unresolved-untested
UNRESOLVED: test-unsupported-unresolved-unresolved
-Running tests-untested.exp ...
+Running /foo/bar/testsuite/tests-untested.exp ...
PASS: test-untested-pass-pass
XPASS: test-untested-pass-xpass
FAIL: test-untested-pass-fail
@@ -465,7 +465,7 @@
UNTESTED: test-untested-unresolved-untested
UNRESOLVED: test-untested-unresolved-unresolved
-Running tests-unresolved.exp ...
+Running /foo/bar/testsuite/tests-unresolved.exp ...
PASS: test-unresolved-pass-pass
XPASS: test-unresolved-pass-xpass
FAIL: test-unresolved-pass-fail
diff --git a/testsuite/sum-merge-expected.txt b/testsuite/sum-merge-expected.txt
index f127364..f5b6772 100644
--- a/testsuite/sum-merge-expected.txt
+++ b/testsuite/sum-merge-expected.txt
@@ -6,7 +6,7 @@
Running target mytarget
-Running tests-pass.exp ...
+Running /foo/bar/testsuite/tests-pass.exp ...
PASS: test-pass-pass-pass
PASS: test-pass-pass-xpass
PASS: test-pass-pass-fail
@@ -72,7 +72,7 @@
PASS: test-pass-unresolved-untested
PASS: test-pass-unresolved-unresolved
-Running tests-xpass.exp ...
+Running /foo/bar/testsuite/tests-xpass.exp ...
PASS: test-xpass-pass-pass
PASS: test-xpass-pass-xpass
PASS: test-xpass-pass-fail
@@ -138,7 +138,7 @@
XPASS: test-xpass-unresolved-untested
XPASS: test-xpass-unresolved-unresolved
-Running tests-fail.exp ...
+Running /foo/bar/testsuite/tests-fail.exp ...
PASS: test-fail-pass-pass
PASS: test-fail-pass-xpass
PASS: test-fail-pass-fail
@@ -204,7 +204,7 @@
FAIL: test-fail-unresolved-untested
FAIL: test-fail-unresolved-unresolved
-Running tests-xfail.exp ...
+Running /foo/bar/testsuite/tests-xfail.exp ...
PASS: test-xfail-pass-pass
PASS: test-xfail-pass-xpass
PASS: test-xfail-pass-fail
@@ -270,7 +270,7 @@
XFAIL: test-xfail-unresolved-untested
XFAIL: test-xfail-unresolved-unresolved
-Running tests-kfail.exp ...
+Running /foo/bar/testsuite/tests-kfail.exp ...
PASS: test-kfail-pass-pass
PASS: test-kfail-pass-xpass
PASS: test-kfail-pass-fail
@@ -336,7 +336,7 @@
KFAIL: test-kfail-unresolved-untested
KFAIL: test-kfail-unresolved-unresolved
-Running tests-unsupported.exp ...
+Running /foo/bar/testsuite/tests-unsupported.exp ...
PASS: test-unsupported-pass-pass
PASS: test-unsupported-pass-xpass
PASS: test-unsupported-pass-fail
@@ -402,7 +402,7 @@
UNSUPPORTED: test-unsupported-unresolved-untested
UNSUPPORTED: test-unsupported-unresolved-unresolved
-Running tests-untested.exp ...
+Running /foo/bar/testsuite/tests-untested.exp ...
PASS: test-untested-pass-pass
PASS: test-untested-pass-xpass
PASS: test-untested-pass-fail
@@ -468,7 +468,7 @@
UNTESTED: test-untested-unresolved-untested
UNTESTED: test-untested-unresolved-unresolved
-Running tests-unresolved.exp ...
+Running /foo/bar/testsuite/tests-unresolved.exp ...
PASS: test-unresolved-pass-pass
PASS: test-unresolved-pass-xpass
PASS: test-unresolved-pass-fail
@@ -534,7 +534,7 @@
UNRESOLVED: test-unresolved-unresolved-untested
UNRESOLVED: test-unresolved-unresolved-unresolved
-Running test-that-only-appears-in-sum-1.exp ...
+Running /foo/bar/testsuite/test-that-only-appears-in-sum-1.exp ...
FAIL: Test that this will appear in the merged sum file
=== gcc-compare-results Summary ===