diff options
| author |   Mu Qiao <qiaomuf@gentoo.org> | 2011-06-28 22:43:50 +0800 |
|---|---|---|
| committer | Mu Qiao <qiaomuf@gentoo.org> | 2011-07-18 23:23:53 +0800 |
| commit | 3bd66c03c5ad80c17b442bdd7a66c563bc6557ab (patch) | |
| tree | 2df96140e6a2087c9459786402b2338f71cf6686 /Makefile.am | |
| parent | Parser: support literal '$' in double quoted string (diff) | |
| download | libbash-3bd66c03c5ad80c17b442bdd7a66c563bc6557ab.tar.gz libbash-3bd66c03c5ad80c17b442bdd7a66c563bc6557ab.tar.bz2 libbash-3bd66c03c5ad80c17b442bdd7a66c563bc6557ab.zip | |
Build: use bash to verify test scripts
We keep the old style for some tests that behave differently depending
on different bash versions.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index f974d3f..2702338 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ GUNIT_TESTS = bashast/gunit/arith_main.gunit \ bashast/gunit/simp_command.gunit \ bashast/gunit/simp_prog.gunit -BASH_LOG_COMPILER = $(srcdir)/test/script_compiler.sh +BASH_LOG_COMPILER = $(srcdir)/test/bash_compiler.sh BASH_TESTS = scripts/var_def.bash \ scripts/var_expansion.bash \ scripts/command_execution.bash \ @@ -56,15 +56,6 @@ BASH_TESTS = scripts/var_def.bash \ scripts/compound_command.bash \ scripts/test_expr.bash \ scripts/binary_arithmetic.bash -BASH_RESULT = scripts/var_def.bash.result \ - scripts/var_expansion.bash.result \ - scripts/command_execution.bash.result \ - scripts/function_def.bash.result \ - scripts/arithmetic_assignment.bash.result \ - scripts/isolated_functions.bash.result \ - scripts/compound_command.bash.result \ - scripts/test_expr.bash.result \ - scripts/binary_arithmetic.bash.result EBUILD_LOG_COMPILER = $(srcdir)/test/ebuild_compiler.sh EBUILD_TESTS = scripts/sunpinyin-2.0.3-r1.ebuild @@ -95,7 +86,8 @@ if HAVE_GTEST TESTS += cppunittests \ test/ast_printer_test.sh \ test/verify_bashs_test.sh \ - test/verify_error_output_test.sh + test/verify_error_output_test.sh \ + test/bash_result_tests.sh check_PROGRAMS = cppunittests cppunittests_SOURCES = test/run_tests.cpp \ @@ -132,11 +124,15 @@ noinst_LIBRARIES = libmetadata.a libmetadata_a_SOURCES = utils/metadata.h utils/metadata.cpp libmetadata_a_CPPFLAGS = $(AM_CPPFLAGS) -Iutils -noinst_PROGRAMS = variable_printer metadata_generator ast_printer instruo +noinst_PROGRAMS = variable_printer metadata_generator ast_printer instruo bash variable_printer_SOURCES = utils/variable_printer.cpp variable_printer_LDADD = libcppbash.la +bash_SOURCES = utils/bash.cpp test/test.h test/test.cpp +bash_LDADD = libcppbash.la +bash_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test/ + metadata_generator_SOURCES = utils/metadata_generator.cpp metadata_generator_LDADD = libcppbash.la libmetadata.a metadata_generator_CPPFLAGS = $(AM_CPPFLAGS) -Iutils @@ -280,6 +276,9 @@ EXTRA_DIST = bashast/bashast.g \ test/ast_printer_test.sh \ test/verify_bashs_test.sh \ test/verify_error_output_test.sh \ + test/bash_result_tests.sh \ + scripts/naughty_tests \ + scripts/naughty_tests.result \ scripts/source_false.sh \ scripts/source_true.sh \ scripts/source_return.sh \ @@ -292,7 +291,6 @@ EXTRA_DIST = bashast/bashast.g \ test_coverage.sh \ autogen.sh \ $(BASH_TESTS) \ - $(BASH_RESULT) \ $(EBUILD_TESTS) \ $(EBUILD_RESULT) \ $(GUNIT_TESTS) \ |