[pocl] 05/11: only override POCL_CACHE_DIR for the testsuite, not HOME

Andreas Beckmann anbe at moszumanska.debian.org
Mon Dec 18 08:15:15 UTC 2017


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

anbe pushed a commit to branch master
in repository pocl.

commit d3069ab048f6abe2ecdcf4942a002e7199cd854e
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Dec 14 03:21:25 2017 +0100

    only override POCL_CACHE_DIR for the testsuite, not HOME
---
 debian/changelog | 1 +
 debian/clean     | 1 +
 debian/rules     | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567e0da..5e2ac37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pocl (0.14-3) UNRELEASED; urgency=medium
   * Switch LLC_HOST_CPU from "pentium3" to the correct baseline "i686" on
     i386.
   * kernel/test_printf actually passes on i386 with LLC_HOST_CPU=i686.
+  * Only override POCL_CACHE_DIR for the testsuite, not HOME.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 14 Dec 2017 02:55:27 +0100
 
diff --git a/debian/clean b/debian/clean
index 12f2060..0774fe8 100644
--- a/debian/clean
+++ b/debian/clean
@@ -2,4 +2,5 @@ include/CL/cl.hpp
 include/CL/cl.hpp.patched
 
 build-doc/
+debian/kcache/
 debian/stamp-failed-testsuite
diff --git a/debian/rules b/debian/rules
index 6cd5ce9..82ecaf4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,13 +73,13 @@ override_dh_auto_test:
 	# Failure in testsuite is delayed until symbols handling
 	# and all files are logged.
 	$(RM) debian/stamp-failed-testsuite
-	$(RM) -r debian/testsuite-tmp-home
-	mkdir debian/testsuite-tmp-home
-	@set -ex; if ! HOME=$(CURDIR)/debian/testsuite-tmp-home dh_auto_test ; then \
+	$(RM) -r debian/kcache
+	mkdir debian/kcache
+	@set -ex; if ! env POCL_CACHE_DIR="$(CURDIR)/debian/kcache" dh_auto_test ; then \
 		echo "***** The testsuite has failed! *****" ; \
 		touch debian/stamp-failed-testsuite; \
 	fi
-	$(RM) -r debian/testsuite-tmp-home
+	$(RM) -r debian/kcache
 
 run_dh_makeshlibs:
 	dh_makeshlibs

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



More information about the Pkg-opencl-commits mailing list