From 7b5cf19e284d5cc9b186af42fa7b708221141ee9 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Wed, 6 May 2015 10:05:21 +0000
Subject: [PATCH] for test programs, assume interactive mode unless "__test" is
 given

---
 lib/librumprun_tester/rumprun_tester.c | 6 +++++-
 tests/runtests.sh                      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/librumprun_tester/rumprun_tester.c b/lib/librumprun_tester/rumprun_tester.c
index 7c73d55..f487b93 100644
--- a/lib/librumprun_tester/rumprun_tester.c
+++ b/lib/librumprun_tester/rumprun_tester.c
@@ -71,6 +71,10 @@ main(int argc, char *argv[])
 {
 	unsigned int i;
 
+	/* were we ran via the test framework? */
+	if (argc < 2 || strcmp(argv[1], "__test") != 0)
+		return rumprun_test(argc, argv);
+
 	/*
 	 * XXX: need a better way to determine disk device!
 	 * e.g. rumpconfig (which has currently not been
@@ -101,7 +105,7 @@ main(int argc, char *argv[])
 	 */
 	printf("=== FOE RUMPRUN 12345 TES-TER 54321 ===\n");
 	atexit(logexit);
-	logrv = rumprun_test(argc, argv);
+	logrv = rumprun_test(argc+1, argv-1);
 	printf("=== RUMPRUN 12345 TES-TER 54321 EOF ===\n");
 
 	exit(logrv);
diff --git a/tests/runtests.sh b/tests/runtests.sh
index b107451..0bfe355 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -66,7 +66,7 @@ runguest ()
 	# img2=$3
 
 	[ -n "${img1}" ] || die runtest without a disk image
-	cookie=$(${RUMPRUN} ${STACK} ${OPT_SUDO} -b ${img1} ${testprog})
+	cookie=$(${RUMPRUN} ${STACK} ${OPT_SUDO} -b ${img1} ${testprog} __test)
 	if [ $? -ne 0 -o -z "${cookie}" ]; then
 		TEST_RESULT=ERROR
 		TEST_ECODE=-2
-- 
2.39.5