The libstdc++ prettyprinters test suite isn't called out in Makefile.am.
Backport Andreas's
patch from mainline so that a sequential test run gives the same results as a
parallel test.
Tested with no regressions on x86_64-linux-gnu and arm-linux-gnueabi. The
prettyprinter
tests are enabled as expected.
OK for 4.7?
-- Michael
2012-07-25 Michael Hope <michael.h...@linaro.org>
Backport from mainline r186389:
2012-04-12 Andreas Schwab <sch...@linux-m68k.org>
* testsuite/Makefile.am (check_DEJAGNUnormal0): Run
prettyprinters.exp.
* testsuite/Makefile.in: Regenerated.
diff --git a/libstdc++-v3/testsuite/Makefile.am
b/libstdc++-v3/testsuite/Makefile.am
index 7094ad5..0cf8de5 100644
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -134,7 +134,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets):
check-DEJAGNU%: site.exp
normal0) \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
- $(RUNTESTFLAGS) abi.exp; \
+ $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
diff --git a/libstdc++-v3/testsuite/Makefile.in
b/libstdc++-v3/testsuite/Makefile.in
index e433bb9..bb077d1 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -572,7 +572,7 @@ check-DEJAGNU $(check_DEJAGNU_normal_targets):
check-DEJAGNU%: site.exp
normal0) \
if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
$$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) \
- $(RUNTESTFLAGS) abi.exp; \
+ $(RUNTESTFLAGS) abi.exp prettyprinters.exp; \
else echo "WARNING: could not find \`runtest'" 1>&2; :;\
fi; \
dirs="`cd $$srcdir; echo [013-9][0-9]_*/*`";; \
