From patchwork Tue Jan 19 13:24:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 8061981 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8DDAB9F1CC for ; Tue, 19 Jan 2016 13:24:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D276420375 for ; Tue, 19 Jan 2016 13:24:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FECC20364 for ; Tue, 19 Jan 2016 13:24:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754915AbcASNYu (ORCPT ); Tue, 19 Jan 2016 08:24:50 -0500 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) Received: from potion ([10.34.1.163]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id u0JDOeQu031741; Tue, 19 Jan 2016 08:24:41 -0500 Received: by potion (sSMTP sendmail emulation); Tue, 19 Jan 2016 14:24:40 +0100 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: kvm@vger.kernel.org Cc: Paolo Bonzini , Andrew Jones 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> In-Reply-To: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> References: <1453209851-27760-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP $TEST_DIR/run doesn't exist for standalone tests, they use $RUNTIME_arch_run in its place. Signed-off-by: Radim Kr?má? --- 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="./$TEST_DIR/run >> test.log" source scripts/runtime.bash config=$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=${QEMU:-qemu-system-$ARCH} verbose=0 @@ -37,14 +39,14 @@ function run() fi done - cmdline="TESTNAME=$testname ACCEL=$accel ./$TEST_DIR-run $kernel -smp $smp $opts" + cmdline="TESTNAME=$testname ACCEL=$accel $RUNTIME_arch_run $kernel -smp $smp $opts" if [ $verbose != 0 ]; then echo $cmdline fi # 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 if [ $? -le 1 ]; then echo -e "\e[32mPASS\e[0m $1"