mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'make distcheck'. 

This disables the tests that don't run correctly out-of-tree from
the 'make check' target. Also add a new 'make fullcheck' target
which is the full old test suite.
This commit is contained in:
Erik de Castro Lopo 2012-02-07 18:41:28 +11:00
parent d7bfc779c8
commit efffc25c18
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -51,7 +51,7 @@ EXTRA_DIST = \
ltmain.sh \
strip_non_asm_libtool_args.sh
fastcheck:
(cd test && make fastcheck)
fullcheck:
(cd test && make fullcheck)
CLEANFILES = *~

55
test/Makefile.am
View File

@ -15,26 +15,47 @@
# restrictive of those mentioned above. See the file COPYING.Xiph in this
# distribution.
if FLaC__WITH_CPPLIBS
CPPLIBS_TESTS = test_libFLAC++.sh
endif
TESTS_ENVIRONMENT = FLAC__TEST_LEVEL=@FLAC__TEST_LEVEL@ FLAC__TEST_WITH_VALRGIND=@FLAC__TEST_WITH_VALGRIND@
SUBDIRS = cuesheets flac-to-flac-metadata-test-files metaflac-test-files pictures
TESTS = \
./test_libFLAC.sh \
$(CPPLIBS_TESTS) \
./test_grabbag.sh \
./test_flac.sh \
./test_metaflac.sh \
./test_seeking.sh \
./test_streams.sh
check_SCRIPTS = \
test_libFLAC.sh \
test_libFLAC++.sh \
test_grabbag.sh \
test_flac.sh \
test_metaflac.sh \
test_seeking.sh \
test_streams.sh
fastcheck: $(TESTS)
# This one should pass when building out-of-tree (eg 'make distcheck').
check: $(check_SCRIPTS)
$(srcdir)/test_libFLAC.sh
if FLaC__WITH_CPPLIBS
$(srcdir)/test_libFLAC++.sh
endif
$(srcdir)/test_seeking.sh
$(srcdir)/test_streams.sh
@echo "----------------"
@echo "All tests passed"
@echo "----------------"
# This is the full test suite, but only works correctly in-tree.
# 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
if FLaC__WITH_CPPLIBS
./test_libFLAC++.sh
endif
./test_grabbag.sh
./test_flac.sh
./test_metaflac.sh
./test_seeking.sh
./test_streams.sh
@echo "----------------"
@echo "All tests passed"
@echo "----------------"
EXTRA_DIST = \
Makefile.lite \
@ -42,13 +63,7 @@ EXTRA_DIST = \
metaflac.flac.in \
metaflac.flac.ok \
picture.ok \
test_libFLAC.sh \
$(CPPLIBS_TESTS) \
test_flac.sh \
test_metaflac.sh \
test_grabbag.sh \
test_seeking.sh \
test_streams.sh \
$(check_SCRIPTS) \
test_wrapper.sh \
test_bins.sh \
write_iff.pl