X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=test%2FMakefile.am;h=dbe5d0d09437c461a4a06a3393a5d4b7a8940f29;hb=b1982fbc5f269dc867a2db67c8d34594ca268a3e;hp=c2aa164c4acbd608286076522843c5c79ee9fed9;hpb=1ca541323b2575d511475791c6eb49a96310ff05;p=platform%2Fupstream%2Fflac.git

diff --git a/test/Makefile.am b/test/Makefile.am
index c2aa164..dbe5d0d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,5 +1,6 @@
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
+#  Copyright (C) 2001-2009  Josh Coalson
+#  Copyright (C) 2011-2013  Xiph.Org Foundation
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -15,26 +16,50 @@
 #  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@
+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
 
-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 \
+	test_compression.sh
+
+# This one should pass when building out-of-tree (eg 'make distcheck').
+check: $(check_SCRIPTS)
+	$(TESTS_ENVIRONMENT) $(srcdir)/test_libFLAC.sh
+if FLaC__WITH_CPPLIBS
+	$(TESTS_ENVIRONMENT) $(srcdir)/test_libFLAC++.sh
+endif
+	$(TESTS_ENVIRONMENT) $(srcdir)/test_seeking.sh
+	$(TESTS_ENVIRONMENT) $(srcdir)/test_streams.sh
+	$(TESTS_ENVIRONMENT) $(srcdir)/test_compression.sh
+	@echo "----------------"
+	@echo "All tests passed"
+	@echo "----------------"
 
-fastcheck: $(TESTS)
-	./test_libFLAC.sh
-	./test_grabbag.sh
+# 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)
+	$(TESTS_ENVIRONMENT) ./test_libFLAC.sh
+if FLaC__WITH_CPPLIBS
+	$(TESTS_ENVIRONMENT) ./test_libFLAC++.sh
+endif
+	$(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 "----------------"
 
 EXTRA_DIST = \
 	Makefile.lite \
@@ -42,13 +67,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