From patchwork Tue Nov 15 13:34:33 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: 624829 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2977734pvb; Tue, 15 Nov 2022 05:36:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6RPG8l2EspfR55qn1qdC+jtTlbZkgZF/57UqsXneFeMDLmBYr54YJTA/5jOSmqBYbMGI0U X-Received: by 2002:a37:7d8:0:b0:6ce:4418:16d6 with SMTP id 207-20020a3707d8000000b006ce441816d6mr14862629qkh.138.1668519376006; Tue, 15 Nov 2022 05:36:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519376; cv=none; d=google.com; s=arc-20160816; b=Aow7s0YjTTRf1Jty/1t31HfXhIyEqsi/sEG4dUljKBfInPyBkHX1cUeWV/K96kFW6h +1iKqQWL5xTEOxKTRFtmHoCe2ZzdU6az3+OIU/ih15okiwjvofvQBGlbgJbYrIPUj7/d 9i4qOE9m/yiBqCuerNwnHXrQe3MVTi+tDQ9Tk1Rr9a+GSrlVRntnrzgexKnt9Y3dlPkn i5CboI3l7OB9mS9TBxPhtxJS6+JNKcEa6lK08+2VxKrHgaCkD1MH/8j8chx+aU12h22s 3I1Ji9FrvQy5sSMe6EpZHXdJpo+fyQCOt4dI8ykviEk/UQ1nyEULDOBTGA6KlgddxORV or4w== 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=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=DjmCrGLQX/yCFVTKI/kGmq++m7m3PKY5ojI0xVVEqbgm1X+f5fsXta65tfN5AMVLqA u45WQbQ8R6/fi2R/rOmyVk1xuuGwToBcAxuA+ad7aRPhPhPn71UFSkmnIpJFxn0YHeUz t3+rMhmoLslt4hBm9bJLgnVUDJhfHenSBNe/n4Q/xqWw2+Mk1jhQwYZPgzkQ8MScWu4v kxCC22O0UiU79rkWJgbgg5ZbrRVnNb7uqASq6Cnh+BV1KuPMZS475C4IJ9Bqj6x7jzOm Njtik+tZEL2yCmZcoddik83ssQVXb6qlhyYd+DoAFloowEEv4WTl2LaUhkkZ5dWwszc6 npRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yQtaUFm7; 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 cb25-20020a05622a1f9900b003a5279ddd36si7692792qtb.576.2022.11.15.05.36.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:36:16 -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=yQtaUFm7; 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 1ouw60-0006Rx-AN; Tue, 15 Nov 2022 08:35:25 -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 1ouw5O-0006I4-Of for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:51 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5M-0004Ir-Ox for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id j15so24315778wrq.3 for ; Tue, 15 Nov 2022 05:34:44 -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=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=yQtaUFm7Qmv9Y7PgtR57DZFE6aQoJobYUhCR83MIhMsHw6+vBtpBKvDkwKyDLb+iXD XyLui49oMy1V+OF6w77Ae0+dPGfXnRjtRHfda4jz/tNJCFnPOJBiTgFvVvXzCz8Ke3dj MvsWLNxzTfCoy6uA5E5VMQfe5dqUNLCWVVDR3LDv2UDUulAkhXTCzXa6uUGIrjwCqVQ4 ktxVEdBSEl5E6b2UQA2m3ncmFRaM9xzi4EeFjUQr0T18A8TT2aU1VvmsO952L+04IT/d bodHyp0FptQDnfQpgjkta+2HToXXRu0PJXUi9YQbKpfUWGGmH503MdabUAhBy5vLOa+q mBKg== 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=zmtOF1FOfTVQ/UMG540fiUZpW6VglR6cjorQt52ST+E=; b=lM4ICzBN6clTV+wZ5vhTa87egKbnifvDYpxuNdUd+h1ml2SMOKZ3Jun0kyq8XNkD47 hoZrTiDZCSIIPiAnL1IvZeIq1aCrbviYIR3b/TsWavGehS2XhTK2sX0IytA4IIGJWEoJ xE3mr9Z27058C5biMgRcCymZ43AJQcpOIU+9/Okp24HwXoOs98Td4IGoK2hmX4grqOUi kax8UDQI/H0U7QOEknc4B2q5y5R8DU3blbq5kk5oONBD5PWTjCtlswBZ2SO++cfilHw5 LySRFoWSVipCrpdsZaNM1yXN94swzVK60A2rfrpl/CAbc+4TbWP2A5gLE2qUD85hm9rU N6QQ== X-Gm-Message-State: ANoB5plchaMjVtzsgOwc7QCdudBcc7dcy3LV2ygWfOsLX87blCIFUSqL YBqlcwHzxRS5BrP3In7KGHACFg== X-Received: by 2002:a5d:4c82:0:b0:236:56a6:823e with SMTP id z2-20020a5d4c82000000b0023656a6823emr10749492wrs.495.1668519283328; Tue, 15 Nov 2022 05:34:43 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k34-20020a05600c1ca200b003b47b80cec3sm24556815wms.42.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:41 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A18D91FFBC; Tue, 15 Nov 2022 13:34:39 +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 04/10] tests/docker: allow user to override check target Date: Tue, 15 Nov 2022 13:34:33 +0000 Message-Id: <20221115133439.2348929-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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: <20221111145529.4020801-5-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()