From patchwork Tue Nov 22 09:56:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 627507 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2345110pvb; Tue, 22 Nov 2022 01:58:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf6QRLOX44rJpEhn89zg4/kpEj37LuLgtOSHmfK50fhdvedPAQL2q6uPmXs2Os6oOip/cQzF X-Received: by 2002:a37:464b:0:b0:6fa:3431:1f2f with SMTP id t72-20020a37464b000000b006fa34311f2fmr5226921qka.81.1669111129665; Tue, 22 Nov 2022 01:58:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111129; cv=none; d=google.com; s=arc-20160816; b=R8TqzPZBGiGuHZDqFpF4+KVRB0Rxgr7QGpv6puL9O4993cVrvFHCiNeD4IJhZuFjT6 6hWNGpczX8jurBerEpRBYB8yjR2Lsn4ImHk+MS3Z4QdbVHtM3zpK4gdvpT10hCMIiOv0 kFOTxvG618eW/KZT9KOgyHjJH6qtOMUCJ65klUZtZuQTRIErMmQhCKadztbtyVqJ+YLL KjgtboTAH31/r8GpLemLWZ/uRb1vq2rYIeKeRwcTZldha84rzCY0tGNfsCkXa141Qq5F WQahvR97ql9W5sH3ZCta2Rmv1PeBOZnc9mAKJeHpBTdamEeVlu8b6L46U9s4PVnRCJZD 7Hng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=oSfmfpKXxM4J8qOx6TsNNObCodVj3LCYCa0U54iQMJnIsEtqtNQyxyQzD0ojzJBrpI vX2RCoeLzQogmE6wRARjjDVLYfZ0Odn8bizp31YmnLO0etcrpUtFDH8Vb78WuLZuVqVB q1dg4dYCl0LXphsg1RECsw73fAaNsroqY94ZlQ3n6TE9dwS6ctgDSKnbuJNzt76YJCUm 2lAnX1QksxvfsX2gnfB6MdyETcszOHOyvtEsfsJqDf8dLgUPh1reITyL6UBJVA62w0j4 IIBxx7SkBrFPWemJ17uXnXu/OOnR/eBPxTUad4zwvV1esxOqRaUNmOPsX61EfK3eiJy5 3KRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dmh7C+xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v21-20020a05622a131500b00397bcf554c1si8661771qtk.135.2022.11.22.01.58.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:58:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dmh7C+xy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0t-0002W8-8k; Tue, 22 Nov 2022 04:56:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0n-0002I5-5Y for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003eJ-4s for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:16 -0500 Received: by mail-wr1-x432.google.com with SMTP id z4so9282208wrr.3 for ; Tue, 22 Nov 2022 01:56:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=dmh7C+xyEKzTZj7NErSxo7obQw/CRuM86tg2tnJ9sGrPQe+HQIlxxLIUv1Y2tlSgKQ XJ3PZWsmRNkPozkV9tI4xJrq9PO1N3YFZ00us32SnhLR51Jz0RcJ5NrVaiyevR3VMnjl 8jENZI6CZGaMQRDR3+Nu1k06WqJmEw7Zzk2Sv7e9zqHdYpP6HlzJ5J+BGFAnl5zpzUvU i7weE4SsSqYrn1rZBrPuEImMGjYYq3wNtiIprWoEOxouOMrJmZr1SPqKyC9v+8C3lx9J R9X7pB7R4fD0pjLebI9O+YXSp7SPBMMWAwepMkUMl8FoTwZc27SkKONCtCXjpp9aTapD QTow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lGgDp1psLL587PH6+QgHDpl09CcymDIyo6aN/D9+3S8=; b=rhSZjfW4oXkgXALx3PJHwAjLv/lEmpXmfkLxVnMmZPuXvs5+lHbUFFTwIHzI999bME WPStyenClYQfIlvOhcQF8lKjSz+w2JL6746sQzr+/Yy+7c/Gh2n9QnxNqNFTj8KxTfa4 pKihaHFuzzYPVxI7WeCpwSzsxI5v5sE/mf0EyULMg7sIZdfW/XB5SDOcBSNiNYDJcNZl G7BPs1M6oAO51a35P37RzXvLxuyaU6i7zu3rTmLHdnrpvmJXqnJK0CxDXf5Q7OzgQzHO O4/cs0XgzHMUf1dKzlTqI9CVZEY+81u4Stxprlh8hducvZ1W+UpkT8rUYVUyd7lIJvmz 7H7Q== X-Gm-Message-State: ANoB5pmbTlVzjAfrYHfiVXBgd+HC6F/wjvCms4hosmdWL8wqZdfRWFGz xc4kv9Eqx8N5hQFxOX/RWXgUTdzfYLJVpw== X-Received: by 2002:a5d:5144:0:b0:22d:d4c:e99c with SMTP id u4-20020a5d5144000000b0022d0d4ce99cmr13363285wrt.582.1669110972658; Tue, 22 Nov 2022 01:56:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y10-20020a5d620a000000b002366dd0e030sm13604043wru.68.2022.11.22.01.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFC111FFBB; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL v2 03/11] tests/docker: allow user to override check target Date: Tue, 22 Nov 2022 09:56:02 +0000 Message-Id: <20221122095610.3343175-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This is useful when trying to bisect a particular failing test behind a docker run. For example: make docker-test-clang@fedora \ TARGET_LIST=arm-softmmu \ TEST_COMMAND="meson test qtest-arm/qos-test" \ J=9 V=1 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221117172532.538149-4-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c87f14477a..fc7a3b7e71 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -184,6 +184,7 @@ docker: @echo ' TARGET_LIST=a,b,c Override target list in builds.' @echo ' EXTRA_CONFIGURE_OPTS="..."' @echo ' Extra configure options.' + @echo ' TEST_COMMAND="..." Override the default `make check` target.' @echo ' IMAGES="a b c ..": Restrict available images to subset.' @echo ' TESTS="x y z .." Restrict available tests to subset.' @echo ' J=[0..9]* Overrides the -jN parameter for make commands' @@ -230,6 +231,7 @@ docker-run: docker-qemu-src $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ -e TARGET_LIST=$(subst $(SPACE),$(COMMA),$(TARGET_LIST)) \ -e EXTRA_CONFIGURE_OPTS="$(EXTRA_CONFIGURE_OPTS)" \ + -e TEST_COMMAND="$(TEST_COMMAND)" \ -e V=$V -e J=$J -e DEBUG=$(DEBUG) \ -e SHOW_ENV=$(SHOW_ENV) \ $(if $(NOUSER),, \ diff --git a/tests/docker/common.rc b/tests/docker/common.rc index e6f8cee0d6..9a33df2832 100755 --- a/tests/docker/common.rc +++ b/tests/docker/common.rc @@ -63,12 +63,12 @@ check_qemu() { # default to make check unless the caller specifies if [ $# = 0 ]; then - INVOCATION="check" + INVOCATION="${TEST_COMMAND:-make $MAKEFLAGS check}" else - INVOCATION="$@" + INVOCATION="make $MAKEFLAGS $@" fi - make $MAKEFLAGS $INVOCATION + $INVOCATION } test_fail()