From patchwork Thu Mar 15 13:37:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 146960 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AA15AB6F9F for ; Fri, 16 Mar 2012 00:39:01 +1100 (EST) Received: from localhost ([::1]:58463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8AtP-0007uD-Dv for incoming@patchwork.ozlabs.org; Thu, 15 Mar 2012 09:38:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8At7-0007Y4-8Z for qemu-devel@nongnu.org; Thu, 15 Mar 2012 09:38:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S8At0-0005Xc-IG for qemu-devel@nongnu.org; Thu, 15 Mar 2012 09:38:40 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:33810) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S8At0-0005WO-Bi for qemu-devel@nongnu.org; Thu, 15 Mar 2012 09:38:34 -0400 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 15 Mar 2012 07:38:30 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 15 Mar 2012 07:38:29 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 6919319D804C for ; Thu, 15 Mar 2012 07:38:22 -0600 (MDT) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q2FDbwMD057992 for ; Thu, 15 Mar 2012 07:38:00 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q2FDbv0a028628 for ; Thu, 15 Mar 2012 07:37:57 -0600 Received: from titi.austin.rr.com (sig-9-65-116-158.mts.ibm.com [9.65.116.158]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q2FDbpEM028311; Thu, 15 Mar 2012 07:37:56 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Thu, 15 Mar 2012 08:37:41 -0500 Message-Id: <1331818666-31718-5-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1331818666-31718-1-git-send-email-aliguori@us.ibm.com> References: <1331818666-31718-1-git-send-email-aliguori@us.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12031513-7408-0000-0000-000003770DAF X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.158 Cc: Paolo Bonzini , Anthony Liguori Subject: [Qemu-devel] [PATCH 4/9] make: add check targets based on gtester (v2) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This will run all tests through gtester. The main targets are: $ make check Which will run each unit test and: $ make check-report.html Which will generate a nice HTML report of the test status. Signed-off-by: Anthony Liguori Signed-off-by: Paolo Bonzini --- v1 -> v2 - fix Makefile (Paolo) - add stubs to work around bug in recent gtester (Paolo) gtester-cat: work around recent bug merge into check command --- scripts/gtester-cat | 37 +++++++++++++++++++++++++++++ tests/Makefile | 64 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 4 deletions(-) create mode 100755 scripts/gtester-cat diff --git a/scripts/gtester-cat b/scripts/gtester-cat new file mode 100755 index 0000000..de57e63 --- /dev/null +++ b/scripts/gtester-cat @@ -0,0 +1,37 @@ +#!/bin/sh +# +# Copyright IBM, Corp. 2012 +# +# Authors: +# Anthony Liguori +# +# This work is licensed under the terms of the GNU GPLv2 or later. +# See the COPYING file in the top-level directory. + +cat < + + + qemu + 0.0 + rev + +EOF + +for file in "$@"; do + first="yes" + cat $file | while read LINE; do + if test "$first" = "yes"; then + first="no" + continue + fi + if test "$LINE" = "" -o "$LINE" = ""; then + continue + fi + echo $LINE + done +done + +cat< +EOF diff --git a/tests/Makefile b/tests/Makefile index 9d7cfb3..254c06d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -11,7 +11,13 @@ CHECKS += test-qmp-input-visitor$(EXESUF) CHECKS += test-qmp-output-visitor$(EXESUF) CHECKS += test-string-input-visitor$(EXESUF) CHECKS += test-string-output-visitor$(EXESUF) -CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh + +TEST_SCRIPTS = $(SRC_PATH)/tests/qemu-iotests-quick.sh + + +HW_TESTS= + +TARGETS=$(patsubst %-softmmu,%, $(filter %-softmmu,$(TARGET_DIRS))) check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS) @@ -59,8 +65,58 @@ tests/rtc-test: tests/rtc-test.o tests/libqtest.o .PHONY: check check-block -check: $(CHECKS) - $(call quiet-command, gtester $(CHECKS), " CHECK") - check-block: $(call quiet-command, $(SHELL) $(SRC_PATH)/tests/check-block.sh , " CHECK") + +check-help: + @echo "Regression targets:" + @echo + @echo " make check Run all tests" + @echo " make check-qtest Run qtest tests" + @echo " make check-unit Run qobject tests" + @echo " make check-block Run block tests" + @echo " make check-report.html Generates an HTML test report" + @echo + @echo "Please note that HTML reports do not regenerate if the unit tests" + @echo "has not changed." + @echo + @echo "The variable SPEED can be set to control the gtester speed setting" + +.SECONDARY: + +SPEED ?= quick + +# Reports +check-report-qtest-%.log: $(HW_TESTS) + $(call quiet-command,QTEST_QEMU_BINARY=`basename $@ .log | cut -f4 -d-`-softmmu/qemu-system-`basename $@ .log | cut -f4 -d-` \ + gtester -k -q -o $@ -m=$(SPEED) $(HW_TESTS)," TEST $^ (`basename $@ .log | cut -f4 -d-`)") + +check-report-unit.log: $(CHECKS) + $(call quiet-command,gtester -k -q -m=$(SPEED) -o $@ $^, " TEST $^") + +check-report.log: check-report-unit.log $(patsubst %,check-report-qtest-%.log, $(TARGETS)) + $(call quiet-command,$(SRC_PATH)/scripts/gtester-cat $^ > $@, " GEN $@") + +check-report.html: check-report.log + $(call quiet-command,gtester-report $< > $@, " GEN $@") + +# Check tests + +check-qtest-%: $(HW_TESTS) + @for test in $^; do \ + arch=`echo $@ | cut -f3- -d-`; \ + echo "Running '$$test' with qemu-system-$$arch..."; \ + $(SRC_PATH)/scripts/qtest $$arch-softmmu/qemu-system-$$arch $$test || exit $$?; \ + done + +check-qtest: $(patsubst %,check-qtest-%, $(TARGETS)) + +check-unit: $(addprefix $(shell pwd)/, $(CHECKS)) $(TEST_SCRIPTS) + @for test in $^; do \ + echo "Running '$$test'..."; \ + $$test || exit $?; \ + done + +check: check-unit check-qtest + +.PHONY: check-help check-qtest check-unit check