From nobody Sat May 18 16:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579688744; cv=none; d=zohomail.com; s=zohoarc; b=fUoe7ZXlLebLaEDZKrO82NTxk88OdfRUUVwI+LbriG+MQf+zBykNjbDs9b5K8ExNlaZ9AT4Ugp5z3JfJVMsz2RgHAYHmi6MiIT1G2mSu8FTXVtK1w1o8qKIuT07gMt9fTqsx/Ah7fEkUI3i3F/lFEQPtMVOVczLNxa8xurbPosc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579688744; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zIaWGD0nhATksvssU385Tb+Vkuh573SQJiN/xNTgN2Q=; b=B4V55xhaCWDuz2/LsM4Qh8c8ClRiAv4AEEhFLOjpVHqju4DqzZrxjeF1l+7gx+cVxRTdlL9aUFFVIPajJm1K9UUSINAen/rtqt1v/thSWQaJ4W0442EQ10fcoBAJ3oTIWzbjm6GsRqrfSWDRj2bJEQ30VxkJS4RgazL2LztAwHM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579688744972115.89146082495313; Wed, 22 Jan 2020 02:25:44 -0800 (PST) Received: from localhost ([::1]:39506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDCh-0000tE-KL for importer@patchew.org; Wed, 22 Jan 2020 05:25:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57538) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuD9Z-0005vo-F7 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuD9X-00085P-Uc for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:29 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34740) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuD9X-00084i-O7 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:27 -0500 Received: by mail-wr1-x441.google.com with SMTP id t2so6669682wrr.1 for ; Wed, 22 Jan 2020 02:22:27 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n3sm3351763wmc.27.2020.01.22.02.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 02:22:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C9C681FF8C; Wed, 22 Jan 2020 10:22:23 +0000 (GMT) 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=zIaWGD0nhATksvssU385Tb+Vkuh573SQJiN/xNTgN2Q=; b=pBatA27F/hZbPGOXW/JZYwMc15N5EMht6n22Jy3a8sw1i/3MzD2yCxQGF6USvmr4qM AsSioPYo/bQtunx4Tu/7EXmPnHuZ5UhM1w7PAVLySFY4PswSCmsVl+67lci6j9cXyPdn ouFu2cK/5OENrqMMFWXiAFmiXEfYajikCgUv/ME2ub/lwPerCC0//WJ60Kis5Dmgr9U3 TnK1RFQcdA0IJHjx/LXtPsU9MkGtia7lDkdQh1BtKfSWSuJQ4eTITvUDJ53dIUL6FiMA C6s8yXw6HgmIp7cAp4dF1eJEnOgMYp/pv4tYfGehHj0oAZ6VPXoNrv+X33CZs59kkgeX 8Ymg== 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=zIaWGD0nhATksvssU385Tb+Vkuh573SQJiN/xNTgN2Q=; b=HhElOvaPzp0e77sZinwBGOnH7C8a8QURCYi3+41QKkievaZ5OtI1qEYOTItAgNxvGD rxxmeirsue00s8CU/XAvXSE0jWDXIIkwuz3FIeItAGe4fI6hNWx7TvC4me1XVjM6RTqL aZir5e1PeLfdrPbp9fu0aX/GYWRqJJU3S01La18/TNtVORY3cXzunZMnRCUq/dEphenB Jvdn6p9LKkkDs3WATwXWXMz4fBQjtifFxEKZhLjAo/hhCpCZ7QoKI0Tae98qE5+TaTqk BYIMLEw6WA58tfQ8MX5/Uc8ejyKUtVek60uv2JlvQwX7usqmsMO2ta/cze2LINAd2HuJ 0CrA== X-Gm-Message-State: APjAAAXHsaeiwDCAYu+OH+LA5EGG9XmcTG9mty2I8j7ge6H0ENbwlgNa AEoPVHdJpTQKqKKzMoFUNKl5QYsRkXA= X-Google-Smtp-Source: APXvYqyJ3kas9Gnq6JDJMZEU+JC/iHCs99UaIPnA66A+3ItG88BP1QuSLdHJd29fyAYpOBnXgQFtmA== X-Received: by 2002:a5d:458d:: with SMTP id p13mr10365142wrq.314.1579688546508; Wed, 22 Jan 2020 02:22:26 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/3] tests/docker: move most cross compilers to buster base Date: Wed, 22 Jan 2020 10:22:21 +0000 Message-Id: <20200122102223.20036-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122102223.20036-1-alex.bennee@linaro.org> References: <20200122102223.20036-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This includes fixing up the dependencies (Which were already wrong for one of the mips variants). Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 16 ++++++++-------- tests/docker/dockerfiles/debian-amd64.docker | 2 +- .../docker/dockerfiles/debian-armel-cross.docker | 2 +- .../docker/dockerfiles/debian-armhf-cross.docker | 2 +- .../dockerfiles/debian-mips64el-cross.docker | 2 +- .../dockerfiles/debian-mipsel-cross.docker | 2 +- .../dockerfiles/debian-ppc64el-cross.docker | 2 +- .../docker/dockerfiles/debian-s390x-cross.docker | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 19dbe26169..43a8678688 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -91,19 +91,12 @@ endif # Enforce dependencies for composite images docker-image-debian9-mxe: docker-image-debian9 ifeq ($(HOST_ARCH),x86_64) -docker-image-debian-amd64: docker-image-debian9 +docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross else docker-image-debian-amd64-cross: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64 endif -docker-image-debian-armel-cross: docker-image-debian9 -docker-image-debian-armhf-cross: docker-image-debian9 -docker-image-debian-mips-cross: docker-image-debian9 -docker-image-debian-mipsel-cross: docker-image-debian9 -docker-image-debian-mips64el-cross: docker-image-debian9 -docker-image-debian-ppc64el-cross: docker-image-debian9 -docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe =20 @@ -118,12 +111,19 @@ endif =20 docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 +docker-image-debian-armel-cross: docker-image-debian10 +docker-image-debian-armhf-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 +docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 +docker-image-debian-mips64el-cross: docker-image-debian10 +docker-image-debian-mipsel-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 docker-image-debian-ppc64-cross: docker-image-debian10 +docker-image-debian-ppc64el-cross: docker-image-debian10 docker-image-debian-riscv64-cross: docker-image-debian10 +docker-image-debian-s390x-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 =20 diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/debian-amd64.docker index 431e947ebd..3b860af106 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -4,7 +4,7 @@ # This docker target builds on the debian Stretch base image. Further # libraries which are not widely available are installed by hand. # -FROM qemu:debian9 +FROM qemu:debian10 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 RUN apt update && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index 15378f8ea2..e3794a61c9 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu:debian10 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 # Add the foreign architecture we want and install dependencies diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 4a20af6fe1..e163b8b956 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu:debian10 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture armhf diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 2fca112405..453b53ef72 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -4,7 +4,7 @@ # This docker target builds on the debian Stretch base image. # =20 -FROM qemu:debian9 +FROM qemu:debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 4abf7832ac..3b6e975c68 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu:debian10 =20 MAINTAINER Philippe Mathieu-Daud=C3=A9 =20 diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 9973df9ff7..cd386f01d9 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu:debian10 =20 # Add the foreign architecture we want and install dependencies RUN dpkg --add-architecture ppc64el && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index eb73c98855..43fe59836f 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -3,7 +3,7 @@ # # This docker target builds on the debian Stretch base image. # -FROM qemu:debian9 +FROM qemu:debian10 =20 # Add the s390x architecture RUN dpkg --add-architecture s390x --=20 2.20.1 From nobody Sat May 18 16:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579688651; cv=none; d=zohomail.com; s=zohoarc; b=cAYSgI4VwVmMB2mzIMopTR6TcFaUflJtQ1Utc8GrV30WsOHFZCrvPncKfmAfyLydwVGBCbikMxOdF/bS9sR+mF8gnaOVe73i+mXEv5d1j6SExmVDpyNB8rT97kpLKnnKZkPgjdOLEQmAZlfg8KYSJH7hNTlseHdHIbYpr/w8cFU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579688651; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=N64PndhLvzFA3VlCKFaQ6h0B3g8B9P8sVmk9HMjg8K2pyf8cFe2kc0AXaHvRcjilGKs2mQQZRYlgYAwn6J2lpYd9rklKUkG4qTKr7VcVe7Dun9jraBkVHK1xawCNwiOAmSKXzwDvZ3Uw2Zo0GwAALSqD+ogHoKlppb3Bo/gdy9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579688651857133.00667466994219; Wed, 22 Jan 2020 02:24:11 -0800 (PST) Received: from localhost ([::1]:39462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDBC-0007Dw-IT for importer@patchew.org; Wed, 22 Jan 2020 05:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57542) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuD9Z-0005vp-LY for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuD9Y-00085w-Lg for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:29 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:54407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuD9Y-00085A-GC for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:28 -0500 Received: by mail-wm1-x341.google.com with SMTP id b19so6203600wmj.4 for ; Wed, 22 Jan 2020 02:22:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q14sm3368334wmj.14.2020.01.22.02.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 02:22:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DE9171FF8F; Wed, 22 Jan 2020 10:22:23 +0000 (GMT) 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=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=m/vNa1VZj0E+3i2n6lj4816uWOX8JRchTe+zuQPvU7gY5rAkvF2NcTTVugwopQHGJf C5XBLwcC/OdzNUpeHDvrCz8c3HjCKKzHp7w+KkY2zwbDsrHikGKERdot/el1V+Ovv2SO U4HUMo3awzF8Ng5hm1vMrXMvoeFkZn1lnUtNXifaFg2/tyyG90wzuglAdyIkB9pJzDDa ZOICCEEOYLmwvzxkK1LOHCoJjGDbfvGaDeYl/jOZvTxWL0KX3KjHQUrOZNQHarmaV9Ls HqNVUYCw+SrPGtwiwdqCf6sIfCCPfPUjOlXDNjohymxtl5zzvBa1ob2m9J4gcnWYz9Cs bh1A== 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=2aMYsER9zNwJfrjG23Mx7vaXxE5F7HH8AoPTJnB/ClM=; b=qM/w3FB2dontUCqvoZZCjOQaRh9kLlIbrs2aYWuL8LWU3HNmsZYXLZwDGUz0jISClv R1xBkAxHkgPXQtByG2ymWXP2yh78BOMN7Ixs9SMDsL7PG/NLSN2saObUMJ4Xut8PkxIP 6bleK9z264zx6VxJgvjYjeNS3u1KtOFXXPh6OHOPeSzZjOOeEqA+iXxswGFa3M4E+Gxq Zm7GC1U9UivUoQsMR+BolpA0nt5jJ50GxQixWlaC+wxCZX5GNHZ6igFhNASzpfcRcIYn 6i6Tz6Dt9ku4Kjsr7sfuVrhjzYrV8XEZTm8u4Fefg6+RR2A8xq1p3nvCu1qpYDymwfuV bOrQ== X-Gm-Message-State: APjAAAX2ymUddJE8P912HUIKN7hnaG+37tJCElZtIrq+mqN1w7sNRAU+ dx/H1tcoGVLy5t1IMOTgAcnI9A== X-Google-Smtp-Source: APXvYqzSB3IPI0wn9oHVWMWdQRUcS0kJhrqKifFb/3dTJuzl0E6rndAMHPUWbmeuaWfbWm4DhFbx9Q== X-Received: by 2002:a1c:740b:: with SMTP id p11mr2290250wmc.78.1579688547434; Wed, 22 Jan 2020 02:22:27 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/3] tests/docker: better handle symlinked libs Date: Wed, 22 Jan 2020 10:22:22 +0000 Message-Id: <20200122102223.20036-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122102223.20036-1-alex.bennee@linaro.org> References: <20200122102223.20036-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When we are copying we want to ensure we grab the first resolution (the found in path section). However even that binary might be a symlink so lets make sure we chase the symlinks to copy the right binary to where it can be found. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 31d8adf836..96d4326d53 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -109,7 +109,7 @@ def _get_so_libs(executable): ensure theright data is copied.""" =20 libs =3D [] - ldd_re =3D re.compile(r"(/.*/)(\S*)") + ldd_re =3D re.compile(r"=3D> ?(/.*/)(\S*)") try: ldd_output =3D subprocess.check_output(["ldd", executable]).decode= ('utf-8') for line in ldd_output.split("\n"): @@ -145,6 +145,7 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path =3D os.path.dirname(l) + real_l =3D os.path.realpath(l) _copy_with_mkdir(l, dest_dir, so_path) =20 =20 --=20 2.20.1 From nobody Sat May 18 16:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1579688655; cv=none; d=zohomail.com; s=zohoarc; b=WRa+BGK+Q3b1FwugDyzE6M3TLU15piowMBrpktOien6aXouV5chAlP2KGUXgFy5w/i57pTFEs2Fv0aNIxE5zDm8Pirt8CINB2NYs5cG9k0GFalpwpR1uW5CXxorolZbLeyHrnx1UrGN5Vs4BU1f+Nll1G/q4AOpdW9vBjQnxzmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579688655; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DM/iBTyh2fgUt8WZi/uAjOeBrV5p8xgv4SqZb7PmcyM=; b=Y3u8bA6XJcfJwSKIwvghbv8ygAmBGvcGME4Kljcjo+oMVHdpvmylYZGub2mmQgBt5q7c7kWkrkR40WxjyQJN+CtdgGtSe81f1Qs8qvah9Q4jHpllA+Xfaxatkt70W4MrurJUw+sU3QBUKvvxgS3sscdYbrizGgiegA+TazHpOKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579688655392348.10469480819074; Wed, 22 Jan 2020 02:24:15 -0800 (PST) Received: from localhost ([::1]:39466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDBF-0007IN-SP for importer@patchew.org; Wed, 22 Jan 2020 05:24:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57557) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuD9a-0005wF-U4 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuD9Z-00086s-M0 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:30 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:34060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuD9Z-000869-GE for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:22:29 -0500 Received: by mail-wr1-x42e.google.com with SMTP id t2so6669788wrr.1 for ; Wed, 22 Jan 2020 02:22:29 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t12sm56156051wrs.96.2020.01.22.02.22.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2020 02:22:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F2CE91FF90; Wed, 22 Jan 2020 10:22:23 +0000 (GMT) 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=DM/iBTyh2fgUt8WZi/uAjOeBrV5p8xgv4SqZb7PmcyM=; b=fokiia/DmOxZCktz/EqNVjM0dX/mPDNE2qx1FotJTbn1P1xts4hiJ6BULU+DOR7GHa zZP6cYnORUC5eW9JFHnCVoeCKpA1fv/vjQzBIOqqd2Y1ONfG1xwdPaIIvJKN490wFObq sE+PO2fweT3/FWx6h7kOj5xaK/knhOXlO6Pz1wyPkK1y7NfheTIhPSXKOCiXmfzrwYUd 4zEFG88xDjCecy3CcJsTGx9RDemwVQ9apdz4qWEZtuX/a3l7h0tphpfWDbJlQ1CPhLsk wxRRmiPGVChKJsOy3fA5tj7wYS35h/m7DUFsBMSo4Z5B9KFWp5S7kwPa9NRp40kH2+9M aApQ== 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=DM/iBTyh2fgUt8WZi/uAjOeBrV5p8xgv4SqZb7PmcyM=; b=LU8PU6dprC7N1WZhcq5fGFygXl0CFpGeMpJOOYreLw/+8kOFLptgmSMVu0aHMU98IS nscBysaHnWsSUrRdQIGw//RDhu5m2+lOKR/61467rzqAi1tSWWe/rsP/6ma1bttMjoO+ GD284kbo8sldrdhioP10u7UtdbqwPXpbLLrJpUuv2QCBb5YX5Ml55k+vGq9U56sRTWYC ApeCaobfWTDOVogXU9lQYAtyuoDD+beqNt09XgaNZCH3tSA5CWyc1rNf78NiDqGKN7j1 W8yEpxvy/9BKYWOPfRbqN0Fgs88XJTaQ3y/niyyJurIVF1GcXJbXqIUEPGmEgg4AMci2 85IQ== X-Gm-Message-State: APjAAAUD5g8QR81MVcEMLYHvTRTm7pPmfF3pQMgI0fMk/CHh+ROiaKps RWd6dt5Gaw95JZKayOciYFJG61LSows= X-Google-Smtp-Source: APXvYqy/C34D/UfT3rHp6toEI3ViceWCzUVY50JHT246a1s2/r7Ej44IGefWCtMGRzJXDk67L9hyfA== X-Received: by 2002:a5d:6a83:: with SMTP id s3mr9677822wru.99.1579688548388; Wed, 22 Jan 2020 02:22:28 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/3] gitlab-ci: Refresh the list of iotests Date: Wed, 22 Jan 2020 10:22:23 +0000 Message-Id: <20200122102223.20036-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200122102223.20036-1-alex.bennee@linaro.org> References: <20200122102223.20036-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, stefanb@linux.vnet.ibm.com, richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Thomas Huth iotest 147 and 205 have recently been marked as "NBD-only", so they are currently simply skipped and thus can be removed. iotest 129 occasionally fails in the gitlab-CI, and according to Max, there are some known issues with this test (see for example this URL: https://lists.nongnu.org/archive/html/qemu-block/2019-06/msg00499.html ), so for the time being, let's disable it until the problems are fixed. The iotests 040, 127, 203 and 256 are scheduled to become part of "make check-block", so we also do not have to test them seperately here anymore. On the other side, new iotests have been added to the QEMU repository in the past months, so we can now add some new test > 256 instead. Signed-off-by: Thomas Huth Message-Id: <20200121131936.8214-1-thuth@redhat.com> --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 228783993e..c15e394f09 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,12 +54,12 @@ build-tcg-disabled: - make check-qapi-schema - cd tests/qemu-iotests/ - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 - 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160 - 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236 - - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 = 102 - 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194 - 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247 - 248 250 254 255 256 + 052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163 + 170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277 + - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 = 122 + 124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202 + 208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258 + 260 261 262 263 264 270 272 273 277 279 =20 build-user: script: --=20 2.20.1