From patchwork Tue Jan 3 10:10:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 710441 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tt8qN46kYz9s5g for ; Tue, 3 Jan 2017 21:11:25 +1100 (AEDT) Received: from localhost ([::1]:32895 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOM3v-0006Bp-Ej for incoming@patchwork.ozlabs.org; Tue, 03 Jan 2017 05:11:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOM2o-0005bX-If for qemu-devel@nongnu.org; Tue, 03 Jan 2017 05:10:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOM2n-0007ja-BR for qemu-devel@nongnu.org; Tue, 03 Jan 2017 05:10:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37660) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOM2n-0007jO-34 for qemu-devel@nongnu.org; Tue, 03 Jan 2017 05:10:13 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4EFD683F3E; Tue, 3 Jan 2017 10:10:13 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-4-159.pek2.redhat.com [10.72.4.159]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v03AA6Wu005623; Tue, 3 Jan 2017 05:10:10 -0500 From: Peter Xu To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Tue, 3 Jan 2017 18:10:04 +0800 Message-Id: <1483438205-31110-2-git-send-email-peterx@redhat.com> In-Reply-To: <1483438205-31110-1-git-send-email-peterx@redhat.com> References: <1483438205-31110-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 03 Jan 2017 10:10:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [kvm-unit-tests PATCH v2 1/2] run_tests: put logs into per-test file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Andrew Jones , peterx@redhat.com, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We were using test.log before to keep all the test logs. This patch creates one log file per test case under logs/ directory with name "TESTNAME.log". A new file global.bash is added to store global informations. Signed-off-by: Peter Xu --- Makefile | 4 ++-- run_tests.sh | 14 ++++++++------ scripts/functions.bash | 11 +++++++++-- scripts/global.bash | 2 ++ 4 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 scripts/global.bash diff --git a/Makefile b/Makefile index a32333b..f632c6c 100644 --- a/Makefile +++ b/Makefile @@ -94,9 +94,9 @@ libfdt_clean: $(LIBFDT_objdir)/.*.d distclean: clean libfdt_clean - $(RM) lib/asm config.mak $(TEST_DIR)-run test.log msr.out cscope.* \ + $(RM) lib/asm config.mak $(TEST_DIR)-run msr.out cscope.* \ build-head - $(RM) -r tests + $(RM) -r tests logs cscope: cscope_dirs = lib lib/libfdt lib/linux $(TEST_DIR) $(ARCH_LIBDIRS) lib/asm-generic cscope: diff --git a/run_tests.sh b/run_tests.sh index 254129d..e1bb3a6 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -7,6 +7,7 @@ if [ ! -f config.mak ]; then exit 1 fi source config.mak +source scripts/global.bash source scripts/functions.bash function usage() @@ -46,17 +47,18 @@ while getopts "g:hv" opt; do esac done -RUNTIME_log_stderr () { cat >> test.log; } +# RUNTIME_log_file will be configured later +RUNTIME_log_stderr () { cat >> $RUNTIME_log_file; } RUNTIME_log_stdout () { if [ "$PRETTY_PRINT_STACKS" = "yes" ]; then - ./scripts/pretty_print_stacks.py $1 >> test.log + ./scripts/pretty_print_stacks.py $1 >> $RUNTIME_log_file else - cat >> test.log + cat >> $RUNTIME_log_file fi } - config=$TEST_DIR/unittests.cfg -rm -f test.log -printf "BUILD_HEAD=$(cat build-head)\n\n" > test.log +rm -rf $ut_log_dir +mkdir $ut_log_dir +printf "BUILD_HEAD=$(cat build-head)\n\n" > $ut_log_summary for_each_unittest $config run diff --git a/scripts/functions.bash b/scripts/functions.bash index ee9143c..d1d2e1c 100644 --- a/scripts/functions.bash +++ b/scripts/functions.bash @@ -1,3 +1,10 @@ +function run_task() +{ + local testname="$2" + + RUNTIME_log_file="${ut_log_dir}/${testname}.log" + "$@" +} function for_each_unittest() { @@ -17,7 +24,7 @@ function for_each_unittest() while read -u $fd line; do if [[ "$line" =~ ^\[(.*)\]$ ]]; then - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" testname=${BASH_REMATCH[1]} smp=1 kernel="" @@ -45,6 +52,6 @@ function for_each_unittest() timeout=${BASH_REMATCH[1]} fi done - "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" + run_task "$cmd" "$testname" "$groups" "$smp" "$kernel" "$opts" "$arch" "$check" "$accel" "$timeout" exec {fd}<&- } diff --git a/scripts/global.bash b/scripts/global.bash new file mode 100644 index 0000000..77b0b29 --- /dev/null +++ b/scripts/global.bash @@ -0,0 +1,2 @@ +: ${ut_log_dir:=logs} +: ${ut_log_summary:=${ut_log_dir}/SUMMARY}