From patchwork Mon Jan 9 04:04:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 9503747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 47DA46075F for ; Mon, 9 Jan 2017 04:05:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 378582811E for ; Mon, 9 Jan 2017 04:05:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CA2028334; Mon, 9 Jan 2017 04:05:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B14A32817F for ; Mon, 9 Jan 2017 04:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939249AbdAIEFE (ORCPT ); Sun, 8 Jan 2017 23:05:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35520 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754963AbdAIEFD (ORCPT ); Sun, 8 Jan 2017 23:05:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (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 5C02161B84; Mon, 9 Jan 2017 04:05:04 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-4-248.pek2.redhat.com [10.72.4.248]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0944ufi029859; Sun, 8 Jan 2017 23:05:01 -0500 From: Peter Xu To: qemu-devel@nongnu.org, kvm@vger.kernel.org Cc: Paolo Bonzini , Andrew Jones , peterx@redhat.com, =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [kvm-unit-tests PATCH v4 1/2] run_tests: put logs into per-test file Date: Mon, 9 Jan 2017 12:04:53 +0800 Message-Id: <1483934694-32425-2-git-send-email-peterx@redhat.com> In-Reply-To: <1483934694-32425-1-git-send-email-peterx@redhat.com> References: <1483934694-32425-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 09 Jan 2017 04:05:04 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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". Meanwhile, we will keep the last time log into logs.old/. Renaming scripts/functions.bash into scripts/common.bash to store some more global variables. Signed-off-by: Peter Xu --- .gitignore | 3 ++- Makefile | 4 ++-- run_tests.sh | 22 +++++++++++++++------- scripts/{functions.bash => common.bash} | 13 +++++++++++-- scripts/mkstandalone.sh | 2 +- 5 files changed, 31 insertions(+), 13 deletions(-) rename scripts/{functions.bash => common.bash} (75%) diff --git a/.gitignore b/.gitignore index 3155418..0dc9a39 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,8 @@ cscope.* /lib/asm /config.mak /*-run -/test.log /msr.out /tests /build-head +logs +logs.old diff --git a/Makefile b/Makefile index a32333b..bd8843a 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 logs.old 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..1e36d66 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -7,7 +7,7 @@ if [ ! -f config.mak ]; then exit 1 fi source config.mak -source scripts/functions.bash +source scripts/common.bash function usage() { @@ -46,17 +46,25 @@ 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 $unittest_log_dir.old +if ! mv $unittest_log_dir $unittest_log_dir.log; then + echo "Failed to backup $unittest_log_dir" + exit 2 +fi + +mkdir $unittest_log_dir +echo "BUILD_HEAD=$(cat build-head)" > $unittest_log_dir/SUMMARY + for_each_unittest $config run diff --git a/scripts/functions.bash b/scripts/common.bash similarity index 75% rename from scripts/functions.bash rename to scripts/common.bash index ee9143c..2dd7360 100644 --- a/scripts/functions.bash +++ b/scripts/common.bash @@ -1,3 +1,12 @@ +: ${unittest_log_dir:=logs} + +function run_task() +{ + local testname="$2" + + RUNTIME_log_file="${unittest_log_dir}/${testname}.log" + "$@" +} function for_each_unittest() { @@ -17,7 +26,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 +54,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/mkstandalone.sh b/scripts/mkstandalone.sh index d2bae19..3c1938e 100755 --- a/scripts/mkstandalone.sh +++ b/scripts/mkstandalone.sh @@ -5,7 +5,7 @@ if [ ! -f config.mak ]; then exit 1 fi source config.mak -source scripts/functions.bash +source scripts/common.bash escape () {