[fflas-ffpack] 01/02: debian/tests/upstream-tests: Add new tests included in version 2.2.2; simplify using implicit make rules.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository fflas-ffpack.

commit c363e3776260689b471ecb658d12b77880cf4e83
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Sat Sep 3 13:48:55 2016 -0400

    debian/tests/upstream-tests: Add new tests included in version 2.2.2;
    simplify using implicit make rules.
---
 debian/changelog            | 10 +++++++++
 debian/tests/control        |  1 +
 debian/tests/upstream-tests | 53 ++++++++++++++++++++++-----------------------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1461166..e50cb68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+fflas-ffpack (2.2.2-5) UNRELEASED; urgency=medium
+
+  * debian/tests/upstream-tests
+    - Add new tests included in version 2.2.2.
+    - Simplify by using implicit make rules.
+    - Add allow-stderr to Restrictions.  The tests output logs to stderr,
+      causing false positives.
+
+ -- Doug Torrance <dtorrance at piedmont.edu>  Thu, 12 Jan 2017 22:45:33 -0500
+
 fflas-ffpack (2.2.2-4) unstable; urgency=medium
 
   * debian/rules
diff --git a/debian/tests/control b/debian/tests/control
index 1b87d30..e8ad984 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,4 @@
 Tests: upstream-tests
 Depends: build-essential,fflas-ffpack, libgmp-dev, libgivaro-dev, libblas-dev,
 	 liblapack-dev, pkg-config
+Restrictions: allow-stderr
diff --git a/debian/tests/upstream-tests b/debian/tests/upstream-tests
index ef4ebd2..c0c2c88 100755
--- a/debian/tests/upstream-tests
+++ b/debian/tests/upstream-tests
@@ -1,36 +1,32 @@
 #!/usr/bin/make -f
 
-CPPFLAGS = $(shell pkg-config fflas-ffpack --cflags) -std=gnu++11 \
+CPPFLAGS = $(shell pkg-config fflas-ffpack --cflags) \
 	-I/usr/include/fflas-ffpack/utils
-LIBS = $(shell pkg-config fflas-ffpack --libs)
+LDLIBS = $(shell pkg-config fflas-ffpack --libs)
+CC = g++
+VPATH=tests
 
 TESTS = test-lu             \
 	test-det            \
 	test-echelon        \
 	test-rankprofiles   \
 	test-compressQ      \
+	test-permutations   \
 	test-fadd           \
 	test-finit          \
 	test-fscal          \
 	test-fgemm          \
+	test-pluq-check     \
+	test-fgemm-check    \
+	test-ftrsm-check    \
+	test-invert-check   \
+	test-charpoly-check \
 	test-fger           \
-	test-ftrsm          \
-	test-multifile      \
+	test-multifile1     \
+	test-maxdelayeddim  \
 	regression-check
-
-test-lu_SOURCES           = tests/test-lu.C
-test-det_SOURCES          = tests/test-det.C
-test-echelon_SOURCES      = tests/test-echelon.C
-test-rankprofiles_SOURCES = tests/test-rankprofiles.C
-test-compressQ_SOURCES    = tests/test-compressQ.C
-test-fadd_SOURCES         = tests/test-fadd.C
-test-finit_SOURCES        = tests/test-finit.C
-test-fscal_SOURCES        = tests/test-fscal.C
-test-fgemm_SOURCES        = tests/test-fgemm.C
-test-fger_SOURCES         = tests/test-fger.C
-test-ftrsm_SOURCES        = tests/test-ftrsm.C
-test-multifile_SOURCES    = tests/test-multifile1.C tests/test-multifile2.C
-regression-check_SOURCES  = tests/regression-check.C
+#	test-ftrsm - skipping for now
+#	(see https://github.com/linbox-team/fflas-ffpack/issues/29)
 
 all: $(TESTS)
 	@PASS=0; \
@@ -40,20 +36,23 @@ all: $(TESTS)
 		./$$TEST > /dev/null ; \
 		if [ $$? = 0 ]; \
 		then \
-		echo "PASS: $$TEST"; \
-		PASS=$$(($$PASS+1)); \
-	else \
-		echo "FAIL: $$TEST"; \
-		FAIL=$$(($$FAIL+1)); \
-	fi; \
+			echo "PASS: $$TEST"; \
+			PASS=$$(($$PASS+1)); \
+		else \
+			echo "FAIL: $$TEST"; \
+			FAIL=$$(($$FAIL+1)); \
+		fi; \
 	done; \
 	echo "========"; \
 	echo "Summary:"; \
 	echo "========"; \
 	echo "PASS: $$PASS"; \
 	echo "FAIL: $$FAIL"; \
-	rm -f $(TESTS) fflas-fpack/config.h; \
+	rm -f $(TESTS) *.o; \
 	exit $$FAIL
 
-$(TESTS):
-	$(CXX) $(CPPFLAGS) $($@_SOURCES) $(LIBS) -o $@
+# we rename test-multifile -> testmultifile1 to take advantage of implicit rules
+test-multifile1: test-multifile2.o
+
+clean:
+	rm -f $(TESTS) *.o

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fflas-ffpack.git