diff options
Diffstat (limited to 'libstdc++-v3/testsuite/Makefile.am')
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.am | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index 05e23f1f9e6..955a01c9bf6 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -48,15 +48,6 @@ libv3test_a_SOURCES = \ testsuite_allocator.cc \ testsuite_hooks.cc -## Build support utilities. -if GLIBCXX_TEST_ABI -noinst_PROGRAMS = abi_check -else -noinst_PROGRAMS = -endif -abi_check_SOURCES = abi_check.cc -abi_check_DEPENDENCIES = libv3test.a - all-local: stamp_wchar testsuite_files # Enable wchar_t tests if capable. @@ -75,8 +66,32 @@ lists_of_files = \ testsuite_files_performance -# This is automatically run after the generated check-DEJAGNU rule. -check-local: check-abi +# We need more things in site.exp, but automake completely controls the +# creation of that file; there's no way to append to it without messing up +# the dependancy chains. So we overrule automake. This rule is exactly +# what it would have generated, plus our own additions. +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo 'set libiconv "$(LIBICONV)"' >>site.tmp + @echo 'set baseline_file "$(baseline_file)"' >> site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp baseline_file = ${baseline_dir}/baseline_symbols.txt extract_symvers = $(glibcxx_srcdir)/scripts/extract_symvers @@ -105,19 +120,10 @@ new-abi-baseline: if GLIBCXX_TEST_ABI # Use 'new-abi-baseline' to create an initial symbol file. Then run # 'check-abi' to test for changes against that file. -check-abi: abi_check baseline_symbols current_symbols.txt - -@./abi_check --check ./current_symbols.txt ${baseline_file} \ - 2>&1 | tee libstdc++-abi.sum - -@cp libstdc++-abi.sum libstdc++-abi.log - -check-abi-verbose: abi_check baseline_symbols current_symbols.txt - -@./abi_check --check-verbose ./current_symbols.txt ${baseline_file} \ - 2>&1 | tee libstdc++-abi.sum - -@cp libstdc++-abi.sum libstdc++-abi.log - +check-abi: baseline_symbols site.exp + -@runtest --tool libstdc++ abi.exp else check-abi: -check-abi-verbose: endif |