From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH kvm-unit-tests 07/12] scripts/runtime: change callsite of $TEST_DIR/run Date: Tue, 19 Jan 2016 14:24:06 +0100 Message-ID: <1453209851-27760-8-git-send-email-rkrcmar@redhat.com> References: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Paolo Bonzini , Andrew Jones To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:41494 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932156AbcASNYo (ORCPT ); Tue, 19 Jan 2016 08:24:44 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 332878D3B5 for ; Tue, 19 Jan 2016 13:24:44 +0000 (UTC) In-Reply-To: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: $TEST_DIR/run doesn't exist for standalone tests, they use $RUNTIME_arch_run in its place. Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 --- run_tests.sh | 2 ++ scripts/runtime.bash | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 2549679e653b..b488949d219b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -6,6 +6,8 @@ if [ ! -f config.mak ]; then fi source config.mak source scripts/functions.bash + +RUNTIME_arch_run=3D"./$TEST_DIR/run >> test.log" source scripts/runtime.bash =20 config=3D$TEST_DIR/unittests.cfg diff --git a/scripts/runtime.bash b/scripts/runtime.bash index 8813b9ddbf1e..defbef31377d 100644 --- a/scripts/runtime.bash +++ b/scripts/runtime.bash @@ -1,3 +1,5 @@ +[ "${RUNTIME_arch_run?}" ] + qemu=3D${QEMU:-qemu-system-$ARCH} verbose=3D0 =20 @@ -37,14 +39,14 @@ function run() fi done =20 - cmdline=3D"TESTNAME=3D$testname ACCEL=3D$accel ./$TEST_DIR-run $ke= rnel -smp $smp $opts" + cmdline=3D"TESTNAME=3D$testname ACCEL=3D$accel $RUNTIME_arch_run $= kernel -smp $smp $opts" if [ $verbose !=3D 0 ]; then echo $cmdline fi =20 # extra_params in the config file may contain backticks that need = to be # expanded, so use eval to start qemu - eval $cmdline >> test.log + eval $cmdline =20 if [ $? -le 1 ]; then echo -e "\e[32mPASS\e[0m $1" --=20 2.7.0