Use $RUMPRUN/$RUMPRUN_BAKE in tests

diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index 8c6992c664aade9e3471e2f9354aafbc0285269c..27e1f35cfb8148cc6715769257951277d6983196 100644 (file)
--- 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 127c9c7563c2b4cf4e6f6d2703f651f37836ad31..d039a522b8883f02f925cf01c27dbdd8c8d89bad 100755 (executable)
--- 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 54966fcb3057b85b66a80644f1d0d857042fe052..fb0a33b9c0e22174294047a7eb41c6191b9975c9 100755 (executable)
--- 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