[pocl] 03/07: cmake does test logging differently

[Andreas Beckmann]

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

anbe pushed a commit to branch experimental
in repository pocl.

commit 302276a790d67caa17697188cdd28f81afa6ca8b
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Aug 13 01:26:00 2017 +0200

    cmake does test logging differently
---
 debian/rules | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index ef0df01..b76bcd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,14 +83,8 @@ override_dh_auto_test:
 	$(RM) debian/stamp-failed-testsuite
 	$(RM) -r debian/testsuite-tmp-home
 	mkdir debian/testsuite-tmp-home
-	if ! HOME=$(CURDIR)/debian/testsuite-tmp-home dh_auto_test ; then \
-		for f in $$(find tests/testsuite.dir -type f | sort) tests/testsuite.log; do \
-			echo "******************************************" ;\
-			echo "* File: $$f" ;\
-			echo "******************************************" ;\
-			cat $$f ;\
-			echo "******************************************" ;\
-		done ;\
+	@set -ex; if ! HOME=$(CURDIR)/debian/testsuite-tmp-home dh_auto_test ; then \
+		echo "***** The testsuite has failed! *****" ; \
 		touch debian/stamp-failed-testsuite; \
 	fi
 	$(RM) -r debian/testsuite-tmp-home
@@ -99,13 +93,11 @@ run_dh_makeshlibs:
 	dh_makeshlibs
 
 delayed_check_dh_auto_test_result: run_dh_makeshlibs
-	if test -f debian/stamp-failed-testsuite ; then \
+	@set -ex; if test -f debian/stamp-failed-testsuite ; then \
 		echo "***** The testsuite has failed! *****" ; \
-		grep '^ .*FAILED' < tests/testsuite.log ; \
-		sed -r '/Summary of the failures/,/Skipped tests/{/Skipped tests/d;p};d' tests/testsuite.log ; \
 		exit 1 ; \
 	fi
-	@test -f tests/testsuite.log && echo 'The testsuite has passed all tests.' || echo '*** The testsuite was *NOT* run! ***'
+	@test -f obj-*/Testing/Temporary/LastTest.log && echo 'The testsuite has passed all tests.' || echo '*** The testsuite was *NOT* run! ***'
 
 override_dh_makeshlibs: run_dh_makeshlibs delayed_check_dh_auto_test_result
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/pocl.git