| Message ID | 20210406150041.28753-3-alex.bennee@linaro.org |
|---|---|
| State | Accepted |
| Commit | 34019198a19a8e0bb94ffeb5d0a8ffe4b8a4616e |
| Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4651790jai; Tue, 6 Apr 2021 08:04:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx1GP1lZnu8MXRwQvWVomSf2DbOz4CAvnXJ3tr0lWH0rTt9NKJ27DcEkcB3dWzKTkUkoS9t X-Received: by 2002:a05:6e02:104b:: with SMTP id p11mr23274699ilj.77.1617721467807; Tue, 06 Apr 2021 08:04:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617721467; cv=none; d=google.com; s=arc-20160816; b=TNDB867sIhGgKgLnnQqMKM5E7ZyMN52qWHunSQg4zFVgQxhWKW9LOo8qjJhdv45Jz3 /TqtIKsTz+2mcomCsmzOjjo4J7bmayrFB6AQbfHudaS7zE3k1dMGFM54zVoQLQnsSsaJ YS7JozN/DkKs0rZuDMDo21XQOQFeOC0OXbRyDyegptvB8ckxMRYSU7lCWM5SLoZa1+iI dl8/d3cipaktX8/SUDInFqFGG0rUEdPbkdFlEc1FJDT+Pd5ryR4zww5G7cP3mVHjPz4t ESmRJcdfSqtED5Q+amhwdutzPUooqjqqBaNZeF0uXM4zHpeINE42MPB2kaN6bS7cirx2 mqbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=hs7mxy20pMj/ITktlM5CnWRfUPzoR68xIyhkZbF5a6I=; b=UEfKcbL4sgmbxI32+nbYnFo2lOjSXRTksCxwBPExO5VBJ3byLS8zrbM4/HHKy0LfJy nqovq4m13UFydOgjbeFeQ7rewixJSh31aKAKdDMV9TjZQACCJJZ+f8k+/C5PxJ9C94fW 0XGtDQKwWp1gGGsscfpVQQPorXytiwnxypUGNLBrCoLvtoiIAUw2qxQDfIWxRnMdyunt NDzYlLq5HNDOIj3YpsCPo0R5UwFAqTR5V6EcZcEmnz8iDmjIGpZMhREZBasxZhqFO3+q xEo4DRNoYWZxQDL4INy5AtArDveup5SRAM5lHi+pCy2VvL/b/Z1lSdi2xJJzEs84SXJZ oraQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dExffXNC; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n16si20334487jat.35.2021.04.06.08.04.24 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Apr 2021 08:04:27 -0700 (PDT) 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=fail header.i=@linaro.org header.s=google header.b=dExffXNC; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1lTnFg-0000c3-5V for patch@linaro.org; Tue, 06 Apr 2021 11:04:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <alex.bennee@linaro.org>) id 1lTnCH-0006Nv-UE for qemu-devel@nongnu.org; Tue, 06 Apr 2021 11:00:53 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:43627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <alex.bennee@linaro.org>) id 1lTnCB-000515-B2 for qemu-devel@nongnu.org; Tue, 06 Apr 2021 11:00:53 -0400 Received: by mail-wm1-x329.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so7476101wmj.2 for <qemu-devel@nongnu.org>; Tue, 06 Apr 2021 08:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hs7mxy20pMj/ITktlM5CnWRfUPzoR68xIyhkZbF5a6I=; b=dExffXNCQ5hv6GKqU4Bv4sw0xDV+vo8HK9dnYB72bfroUFhzT8EihwtTs1aUfmHcju cuv9wgoUHYVxJJvKbpQ8j68rU52/dQ6obX3OFxn+nVYA2MeOK205cYuk6bIvJFuLRJlY UkMOwU+BgqYYFbb2W+6zaxRH3ukNaE4JcWVfg36GfDksOT1owSpD3MSKo6mMsnitRPNc 90D68IaiWrvMibPtp2IdvMnYcO9rXZtEzVMPL40Vgo8X39pCcxoEzfo5caq+LXoAdBOc 3Xqq++2nnym/L+7DlQCyvjLvXw0OsUWtfOpYMTZlmDeikWiMQXWcT7B9oveGQOAw7ltO 54UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hs7mxy20pMj/ITktlM5CnWRfUPzoR68xIyhkZbF5a6I=; b=bmPjoJqoal8zCk9MbMVvr7XLBok9/fB9Qm1xDDSUn+o2uu/GvRK2eVCPkCdSdyNYod 2h8SM2fWau1N4OANOiTydm6Mm9mf+2GjGWRNl1vf7zeG18SJwJzhGAoOLK3aX7VMLV4S 4yTUlBiUncBx6rXJ9PAqSnh6GaAOJo7JaCAsCvEto7qohY3KA7u44LKmlN79vAAwJ7Ru XvuRW9Z1Jx5xYQ4R8xo5GO9L6sKii3zhVz/JFlRYEa3Vn+XEvjiG7Ossnn1WYVcJ4Lmt X/32RvK2ZXQunxL5O45HQQqA8YegbZI52jk17KP+/4M1GVrzdPL1BbMtX95j48GnXi1J RU9Q== X-Gm-Message-State: AOAM530yVfcNy8oa2Cyj1y5Xq0di3XWIfyZzStdH+8oOCVLScoT2qfRg zpyJxZo25aGd0KleJ/zUEeKN3w== X-Received: by 2002:a1c:7e82:: with SMTP id z124mr4612934wmc.51.1617721245591; Tue, 06 Apr 2021 08:00:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o38sm2448461wmp.37.2021.04.06.08.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 08:00:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 34BE01FF8C; Tue, 6 Apr 2021 16:00:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64 Date: Tue, 6 Apr 2021 16:00:32 +0100 Message-Id: <20210406150041.28753-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210406150041.28753-1-alex.bennee@linaro.org> References: <20210406150041.28753-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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.23 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Thomas Huth <thuth@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org, Wainer dos Santos Moschetta <wainersm@redhat.com>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, Willian Rampazzo <willianr@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
| Series |
rc2 fixes (check-tcg, gitlab, gdbstub)
|
expand
|
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7cab761bf5..9f464cb92c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -16,7 +16,10 @@ DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.doc DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache -DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),registry.gitlab.com/qemu-project/qemu) +ifeq ($(HOST_ARCH),x86_64) +DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu +endif +DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) DOCKER_TESTS := $(notdir $(shell \ find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f))