summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn van Beurden <mvanb1@gmail.com>2013-04-21 22:05:26 +0200
committerErik de Castro Lopo <erikd@mega-nerd.com>2013-04-22 17:42:56 +1000
commitdec61cec91e76ec7f8987b844b212245b79d85d3 (patch)
treec9188caf3e346f44052309fd7138e90bbd3cb7cc
parentbf632684258421c329e572c647d06e76399bd258 (diff)
downloadflac-dec61cec91e76ec7f8987b844b212245b79d85d3.tar.gz
Fixes setting test level and valgrind testing
This should enable using the disable-thorough-tests, enable-exhaustive-tests and enable-valgrind-testing configure switches, because setting these didn't do anything Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
-rw-r--r--test/Makefile.am28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 9bc3b1eb..0b50b56a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,7 +15,7 @@
# restrictive of those mentioned above. See the file COPYING.Xiph in this
# distribution.
-TESTS_ENVIRONMENT = FLAC__TEST_LEVEL=@FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALRGIND=@FLAC__TEST_WITH_VALGRIND@
+TESTS_ENVIRONMENT = FLAC__TEST_LEVEL=@FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALGRIND=@FLAC__TEST_WITH_VALGRIND@
SUBDIRS = cuesheets flac-to-flac-metadata-test-files metaflac-test-files pictures
@@ -31,13 +31,13 @@ check_SCRIPTS = \
# This one should pass when building out-of-tree (eg 'make distcheck').
check: $(check_SCRIPTS)
- $(srcdir)/test_libFLAC.sh
+ $(TESTS_ENVIRONMENT) $(srcdir)/test_libFLAC.sh
if FLaC__WITH_CPPLIBS
- $(srcdir)/test_libFLAC++.sh
+ $(TESTS_ENVIRONMENT) $(srcdir)/test_libFLAC++.sh
endif
- $(srcdir)/test_seeking.sh
- $(srcdir)/test_streams.sh
- $(srcdir)/test_compression.sh
+ $(TESTS_ENVIRONMENT) $(srcdir)/test_seeking.sh
+ $(TESTS_ENVIRONMENT) $(srcdir)/test_streams.sh
+ $(TESTS_ENVIRONMENT) $(srcdir)/test_compression.sh
@echo "----------------"
@echo "All tests passed"
@echo "----------------"
@@ -46,16 +46,16 @@ endif
# In particular test_grabbag.sh, test_flac.sh and test_metaflac.sh will not
# run correctly out-of-tree.
fullcheck: $(check_SCRIPTS)
- ./test_libFLAC.sh
+ $(TESTS_ENVIRONMENT) ./test_libFLAC.sh
if FLaC__WITH_CPPLIBS
- ./test_libFLAC++.sh
+ $(TESTS_ENVIRONMENT) ./test_libFLAC++.sh
endif
- ./test_grabbag.sh
- ./test_flac.sh
- ./test_metaflac.sh
- ./test_seeking.sh
- ./test_streams.sh
- ./test_compression.sh
+ $(TESTS_ENVIRONMENT) ./test_grabbag.sh
+ $(TESTS_ENVIRONMENT) ./test_flac.sh
+ $(TESTS_ENVIRONMENT) ./test_metaflac.sh
+ $(TESTS_ENVIRONMENT) ./test_seeking.sh
+ $(TESTS_ENVIRONMENT) ./test_streams.sh
+ $(TESTS_ENVIRONMENT) ./test_compression.sh
@echo "----------------"
@echo "All tests passed"
@echo "----------------"