From 0eefb76e239552d912bac48fd95e8ee724531822 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Wed, 27 Jan 2016 15:16:01 +0000
Subject: [PATCH] Use $RUMPRUN/$RUMPRUN_BAKE in tests

---
 tests/Makefile.inc  | 2 +-
 tests/buildtests.sh | 6 +++---
 tests/runtests.sh   | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index 8c6992c..27e1f35 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -13,4 +13,4 @@ LDLIBS= -lrumprun_tester
 	$(CXX) $(CXXFLAGS) $< -o $@ $(LDLIBS)
 
 %.bin: %
-	$(RUMPBAKE) $@ $<
+	$(RUMPRUN_BAKE) $(RUMPBAKE_PLATFORM) $@ $<
diff --git a/tests/buildtests.sh b/tests/buildtests.sh
index 127c9c7..d039a52 100755
--- a/tests/buildtests.sh
+++ b/tests/buildtests.sh
@@ -41,10 +41,10 @@ test_apptools()
 
 	case ${PLATFORM} in
 	hw)
-		RUMPBAKE="rumprun-bake hw_generic"
+		RUMPBAKE_PLATFORM='hw_generic'
 		;;
 	xen)
-		RUMPBAKE="rumprun-bake xen_pv"
+		RUMPBAKE_PLATFORM='xen_pv'
 		;;
 	*)
 		echo ">> unknown platform \"$PLATFORM\""
@@ -52,7 +52,7 @@ test_apptools()
 	esac
 
 	export PATH="${PATH}:${RRDEST}/bin"
-	export RUMPBAKE
+	export RUMPBAKE_PLATFORM
 
 	make
 
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 54966fc..fb0a33b 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -25,10 +25,7 @@
 # SUCH DAMAGE.
 #
 
-[ -n "${RUMPRUN_SHCONF}" ] || { echo '>> need RUMPRUN_SHCONF'; exit 1; }
-. "${RUMPRUN_SHCONF}"
-
-export PATH="${PATH}:${RRDEST}/bin"
+[ -n "${RUMPRUN}" ] || { echo '>> need RUMPRUN set in env'; exit 1; }
 
 cd $(dirname $0) || die 'could not enter test dir'
 
@@ -77,7 +74,7 @@ runguest ()
 	# img2=$3
 
 	[ -n "${img1}" ] || die runtest without a disk image
-	cookie=$(rumprun ${OPT_SUDO} ${STACK} -b ${img1} ${testprog} __test)
+	cookie=$(${RUMPRUN} ${OPT_SUDO} ${STACK} -b ${img1} ${testprog} __test)
 	if [ $? -ne 0 -o -z "${cookie}" ]; then
 		TEST_RESULT=ERROR
 		TEST_ECODE=-2
-- 
2.39.5