From patchwork Mon Nov 7 14:52:27 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: 622244 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2229016pvb; Mon, 7 Nov 2022 06:53:03 -0800 (PST) X-Google-Smtp-Source: AMsMyM78CcEvYLxvyaBC/jwAPLM8n9PHdNNTobV624bIX7eFnjycaTYFulO17im5ktZbLOtFGuvV X-Received: by 2002:ac8:4608:0:b0:3a5:31ef:8e8b with SMTP id p8-20020ac84608000000b003a531ef8e8bmr30208216qtn.148.1667832783341; Mon, 07 Nov 2022 06:53:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667832783; cv=none; d=google.com; s=arc-20160816; b=M1ZSYMgRIQ8vkG3g5MMNl3tK1BWWCsQoyrmyuHN2DQBwGqcQ+yWqpbNrTrT3Jga6/X zP4wbze0MKt+Dz63euPagg0wJk/HkUmMuVvguxffVCFAUuG5qGPjoEhMwrW0x0uf+FeW nvR6776JlUdtf8A/VpiKSATzm9Rie6uSZVU4ssZ+Jb93X8kuALe6ffpVK2vt8pnT3OV7 BBKu5KVW+ghPO7uKiu6jnNd5P/ERVR7BE6vSA0GikJpuUUDyJBpwDtc62UT35Wx6d40r iVB6qMDot/zLlcDBTDyxGk0Z8RhKixtaLU/nfitgVjS/Wkofl2sbWpvGXCst9nQKRGl5 jbnA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=Klayg+WpkH+CJg/U8pw+zZPeMnY3Djc00WEgkmrbmK4=; b=ijDNqN/uOsgkGzA+12u5zNwGS22uf7bO4ZHyMGyhHfrLDydealSYtfwbKVBaCTj0aP vTzByfmyp5HkXFVV72jQ8E0JXjP+Fgj/p/emrPz7DKzyopJkFlwWLpjTUiEpiv1PH/R5 qx4YEIfhNNt7EB4sdUn2g9kBpwakeWpjT8ngt1JqROHueArS0vVmqb2j4Le7rZkuQ0JE eeH2JTJBQeeMZlDotBt47sF8nJJPJeeuvsLO9tnPJMZ0sdDd0WO9p3PvWX2R1NqXomyp VkeaTZprTNonqHlUkuTB6JO8e+HSdPunR9hXES8FWMQJ2h6FPCUdEDdeMBH7eUr/L5Ya srcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rN12ye+H; 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 hf6-20020a0562140e8600b004bb92c5c46dsi4934164qvb.318.2022.11.07.06.53.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Nov 2022 06:53:03 -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=rN12ye+H; 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 1os3UM-0003Sw-ER; Mon, 07 Nov 2022 09:52:38 -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 1os3UK-0003SS-BW for qemu-devel@nongnu.org; Mon, 07 Nov 2022 09:52:36 -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 1os3UI-0007vb-ME for qemu-devel@nongnu.org; Mon, 07 Nov 2022 09:52:36 -0500 Received: by mail-wr1-x42d.google.com with SMTP id h9so16641936wrt.0 for ; Mon, 07 Nov 2022 06:52:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Klayg+WpkH+CJg/U8pw+zZPeMnY3Djc00WEgkmrbmK4=; b=rN12ye+Ha30Vy878jAqZsBczem0k7a73UliXiLmqdOyvsUvwN3UAyeTr5Ee7B+EpZQ ulGPIxo0GNTyUezG1XnnOrDVaRUSMzkQsO1+KwwJIt14bSoFyKZonMG5G2RuDcEGoFnb SiBpvywZGXgCHjqWeaLBbTWWyP6vyLls+tBFZQ9D+dQdHhFZBBSl661UGA4tu460a9YE 5LGHbepNAPcf/rH2SlijJgk2R5en9vFx3EeeSEu95jLXPQ8IIWXmlgwncwfolGWiH3lP jxgEobet57aTbZkXl5c0QT/kLVAwemMOU+dBVeMOp4irohu7naQPTvjjiLVE4yF7YVZg 0pDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Klayg+WpkH+CJg/U8pw+zZPeMnY3Djc00WEgkmrbmK4=; b=U01k33PHMvdpc1Gj8FfAx2Vy8DNEIVd6K6ReEbHtTYDujQBry4TQbpddBzbZoXihIY /HT2v4XNDj/yA0vJWxx5zw4FdpJ7o7D3EtsIuTpsiiEaj81tmI3CNsDTGPVg+JVL9Sni 54zxACZqJWdujhRe7dVPtp3z3cpwdbK9wEAu+AkayVb5AlXLPzM3wIitAk78KByNjbJ+ Gcyh4IH2QanNYOYpFpR6saI/DCabGRfHLJoqSi6disV/jxJceqcu2Gc4sh/+pUiaaUBJ SV/46rYcWJ4lBEP5wH4wp9sSuQ7YKnM5Qs8VLu9rc+/Y6vwEZ6RV2izyn8Y+LapDX1jt 6K/Q== X-Gm-Message-State: ACrzQf2AQTsfOC5GQXXcVB5l+t73cPe66bH4H95Bf5YMaeURttLchCpn OVWM55aZoJhNmYNbopU6Jej+Vw== X-Received: by 2002:adf:a74a:0:b0:236:6dc8:f562 with SMTP id e10-20020adfa74a000000b002366dc8f562mr31688305wrd.717.1667832752844; Mon, 07 Nov 2022 06:52:32 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id fc15-20020a05600c524f00b003cf57329221sm12976185wmb.14.2022.11.07.06.52.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Nov 2022 06:52:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CF73A1FFB7; Mon, 7 Nov 2022 14:52:31 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philipp?= =?utf-8?q?e_Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [RFC PATCH] tests/docker: allow user to override check target Date: Mon, 7 Nov 2022 14:52:27 +0000 Message-Id: <20221107145227.1210499-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 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 \ CHECK_TARGET="meson test qtest-arm/qos-test" \ J=9 V=1 Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 2 ++ tests/docker/common.rc | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c87f14477a..ece0aa77df 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 ' CHECK_TARGET="..." 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 CHECK_TARGET="$(CHECK_TARGET)" \ -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..f2769c1ff6 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="${CHECK_TARGET:-make $MAKEFLAGS check}" else - INVOCATION="$@" + INVOCATION="make $MAKEFLAGS $@" fi - make $MAKEFLAGS $INVOCATION + $INVOCATION } test_fail()