citrun

commit 371d933ca7462e59363c477fdb53c51bf878c0a9
parent f9b33cee793e42483220656c5fd55bae3a563968
Author: kyle <kyle@0x30.net>
Date:   Fri, 25 Nov 2016 22:43:14 -0700

t: export CITRUN_PROCDIR in enter_tmpdir

Diffstat:
M
t/utils.subr
 | 
4
++++
M
t/wrap_cmake.sh
 | 
2
+-
M
t/wrap_jam.sh
 | 
2
+-
M
t/wrap_make.sh
 | 
3
+--
M
t/wrap_ninja.sh
 | 
2
+-

5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/t/utils.subr b/t/utils.subr
@@ -25,6 +25,10 @@ modify_PATH()
 
 enter_tmpdir()
 {
+	# Assume that a script wanting to enter a tmpdir also wants a local
+	# process file directory.
+	export CITRUN_PROCDIR="procdir/"
+
 	tmpdir=`mktemp -d /tmp/citrun.XXXXXXXXXX`
 	cd $tmpdir
 }
diff --git a/t/wrap_cmake.sh b/t/wrap_cmake.sh
@@ -45,5 +45,5 @@ EOF
 strip_millis check.out
 ok "is citrun-check output identical" diff -u check.good check.out
 
-CITRUN_PROCDIR="procdir/" ok "does compiled program run" program
+ok "does compiled program run" program
 ok "is runtime shared memory file created" test -f procdir/program_*
diff --git a/t/wrap_jam.sh b/t/wrap_jam.sh
@@ -41,5 +41,5 @@ EOF
 strip_millis check.out
 ok "is citrun-check output identical" diff -u check.good check.out
 
-CITRUN_PROCDIR="procdir/" ok "does compiled program run" program
+ok "does compiled program run" program
 ok "is runtime shared memory file created" test -f procdir/program_*
diff --git a/t/wrap_make.sh b/t/wrap_make.sh
@@ -42,6 +42,5 @@ EOF
 strip_millis check.out
 ok "is citrun-check output identical" diff -u check.good check.out
 
-export CITRUN_PROCFILE="procfile.shm"
-CITRUN_PROCDIR="procdir/" ok "does compiled program run" program
+ok "does compiled program run" program
 ok "is runtime shared memory file created" test -f procdir/program_*
diff --git a/t/wrap_ninja.sh b/t/wrap_ninja.sh
@@ -49,5 +49,5 @@ EOF
 strip_millis check.out
 ok "is citrun-check output identical" diff -u check.good check.out
 
-CITRUN_PROCDIR="procdir/" ok "does compiled program run" program
+ok "does compiled program run" program
 ok "is runtime shared memory file created" test -f procdir/program_*