From nobody Sun Nov 2 00:52:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508481396812237.89332503500668; Thu, 19 Oct 2017 23:36:36 -0700 (PDT) Received: from localhost ([::1]:52362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qv1-0004VL-58 for importer@patchew.org; Fri, 20 Oct 2017 02:36:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qr9-0001d2-QE for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5Qr5-0007NR-WB for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48650) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5Qr5-0007NC-Qc for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D18A540248; Fri, 20 Oct 2017 06:32:26 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-46.pek2.redhat.com [10.72.12.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F2585D75E; Fri, 20 Oct 2017 06:32:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D18A540248 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 14:32:15 +0800 Message-Id: <20171020063219.2035-2-famz@redhat.com> In-Reply-To: <20171020063219.2035-1-famz@redhat.com> References: <20171020063219.2035-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 20 Oct 2017 06:32:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/5] docker: Don't allocate tty unless DEBUG=1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The existence of tty in the container seems to urge gcc into colorizing the errors, but the escape chars will clutter the report once turned into email replies on patchew. Move -t to debug mode. Reported-by: Eric Blake Signed-off-by: Fam Zheng Message-Id: <20171013011954.9975-1-famz@redhat.com> Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 6f9ea196a7..ab939f2bec 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -134,10 +134,10 @@ docker-run: docker-qemu-src " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ $(SRC_PATH)/tests/docker/docker.py run \ - $(if $(NOUSER),,-u $(shell id -u)) -t \ + $(if $(NOUSER),,-u $(shell id -u)) \ --security-opt seccomp=3Dunconfined \ $(if $V,,--rm) \ - $(if $(DEBUG),-i,) \ + $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=3D$(NETWORK)),--net= =3Dnone) \ -e TARGET_LIST=3D$(TARGET_LIST) \ -e EXTRA_CONFIGURE_OPTS=3D"$(EXTRA_CONFIGURE_OPTS)" \ --=20 2.13.5 From nobody Sun Nov 2 00:52:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15084812879711022.2446518606615; Thu, 19 Oct 2017 23:34:47 -0700 (PDT) Received: from localhost ([::1]:52349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qsz-0002gj-7q for importer@patchew.org; Fri, 20 Oct 2017 02:34:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qr8-0001cv-VM for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5Qr7-0007ON-Vq for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36536) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5Qr7-0007Np-Ps for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D60A4C01A69E; Fri, 20 Oct 2017 06:32:28 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-46.pek2.redhat.com [10.72.12.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D6C85D762; Fri, 20 Oct 2017 06:32:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D60A4C01A69E Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 14:32:16 +0800 Message-Id: <20171020063219.2035-3-famz@redhat.com> In-Reply-To: <20171020063219.2035-1-famz@redhat.com> References: <20171020063219.2035-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 20 Oct 2017 06:32:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/5] docker: cleanup temp directory after test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Peter Xu There are temp directories named "docker-src.*" after doing docker tests. I don't see much point in keeping that (it only contains the qemu.tar which is exactly current tree, and the copied "run" file). Let's remove it after test finished. CC: "Alex Benn=C3=A9e" CC: Fam Zheng CC: "Philippe Mathieu-Daud=C3=A9" Signed-off-by: Peter Xu Message-Id: <20171017071247.32355-1-peterx@redhat.com> Reviewed-by: Fam Zheng Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ab939f2bec..38874ec03d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -151,6 +151,8 @@ docker-run: docker-qemu-src $(IMAGE) \ /var/tmp/qemu/run \ $(TEST), " RUN $(TEST) in ${IMAGE}") + $(call quiet-command, rm -r $(DOCKER_SRC_COPY), \ + " CLEANUP $(DOCKER_SRC_COPY)") =20 # Run targets: # --=20 2.13.5 From nobody Sun Nov 2 00:52:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508481276422955.6413306747863; Thu, 19 Oct 2017 23:34:36 -0700 (PDT) Received: from localhost ([::1]:52351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qt7-0002oL-MP for importer@patchew.org; Fri, 20 Oct 2017 02:34:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5QrB-0001dT-3l for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5QrA-0007PB-0Y for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46372) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5Qr9-0007Or-Qb for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:31 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E2224BDF7; Fri, 20 Oct 2017 06:32:30 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-46.pek2.redhat.com [10.72.12.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 902835D75E; Fri, 20 Oct 2017 06:32:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E2224BDF7 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 14:32:17 +0800 Message-Id: <20171020063219.2035-4-famz@redhat.com> In-Reply-To: <20171020063219.2035-1-famz@redhat.com> References: <20171020063219.2035-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 20 Oct 2017 06:32:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/5] docker: allow running from srcdir != builddir build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini The new script uses "git submodule", which is picky about being invoked from the top of the git checkout. Invoke the script from $(SRC_PATH) to avoid git's wrath. Fixes: b7f404201e45e99da23b9764dec27ce5f965cdcd Cc: Fam Zheng Signed-off-by: Paolo Bonzini Message-Id: <1508331989-142364-1-git-send-email-pbonzini@redhat.com> Reviewed-by: Daniel P. Berrange Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 38874ec03d..02cd520590 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -18,11 +18,11 @@ TESTS ?=3D % IMAGES ?=3D % =20 CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) -DOCKER_SRC_COPY :=3D docker-src.$(CUR_TIME) +DOCKER_SRC_COPY :=3D $(BUILD_DIR)/docker-src.$(CUR_TIME) =20 $(DOCKER_SRC_COPY): @mkdir $@ - $(call quiet-command, $(SRC_PATH)/scripts/archive-source.sh $@/qemu.tar, \ + $(call quiet-command, cd $(SRC_PATH) && scripts/archive-source.sh $@/qemu= .tar, \ "GEN", "$@/qemu.tar") $(call quiet-command, cp $(SRC_PATH)/tests/docker/run $@/run, \ "COPY","RUNNER") --=20 2.13.5 From nobody Sun Nov 2 00:52:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508481283451930.711590462816; Thu, 19 Oct 2017 23:34:43 -0700 (PDT) Received: from localhost ([::1]:52352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qt9-0002ps-Jw for importer@patchew.org; Fri, 20 Oct 2017 02:34:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5QrE-0001g2-Bv for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5QrC-0007Pq-1v for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36728) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5QrB-0007Pd-Rl for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8956C04AC49; Fri, 20 Oct 2017 06:32:32 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-46.pek2.redhat.com [10.72.12.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 945875D762; Fri, 20 Oct 2017 06:32:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E8956C04AC49 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 14:32:18 +0800 Message-Id: <20171020063219.2035-5-famz@redhat.com> In-Reply-To: <20171020063219.2035-1-famz@redhat.com> References: <20171020063219.2035-1-famz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 20 Oct 2017 06:32:33 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/5] docker: fix out-of-tree 'make docker-test-build@debian-powerpc-cross' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Greg Kurz Without this patch, it fails with: IOError: [Errno 2] No such file or directory: 'tests/docker/dockerfiles/debian-apt-fake.sh' Signed-off-by: Greg Kurz Message-Id: <150841324224.31292.4012464539983692364.stgit@bahia.lan> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 02cd520590..f1a398e9fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -44,7 +44,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXECUTABLE),--include-executable=3D$(EXECUTABLE)),\ "BUILD","$*") =20 -docker-image-debian-powerpc-cross: EXTRA_FILES:=3Dtests/docker/dockerfiles= /debian-apt-fake.sh +docker-image-debian-powerpc-cross: EXTRA_FILES:=3D$(SRC_PATH)/tests/docker= /dockerfiles/debian-apt-fake.sh =20 # Enforce dependancies for composite images docker-image-debian: docker-image-debian9 --=20 2.13.5 From nobody Sun Nov 2 00:52:33 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508481395825812.5733393400943; Thu, 19 Oct 2017 23:36:35 -0700 (PDT) Received: from localhost ([::1]:52361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Qv0-0004Uq-4D for importer@patchew.org; Fri, 20 Oct 2017 02:36:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5QrF-0001hL-LU for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5QrE-0007RC-V4 for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e5QrE-0007QL-OI for qemu-devel@nongnu.org; Fri, 20 Oct 2017 02:32:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BCAE61E57; Fri, 20 Oct 2017 06:32:35 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-46.pek2.redhat.com [10.72.12.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CD445D75E; Fri, 20 Oct 2017 06:32:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BCAE61E57 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 20 Oct 2017 14:32:19 +0800 Message-Id: <20171020063219.2035-6-famz@redhat.com> In-Reply-To: <20171020063219.2035-1-famz@redhat.com> References: <20171020063219.2035-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 20 Oct 2017 06:32:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/5] docker: Fix PATH for ccache X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Before bcd7f06f57fb6f780a3e2f7a46c22b6f6c8238aa we source /etc/profile so the PATH included the right paths to ccache binaries. Now we need to update $PATH explicitly from run script. Keep the old /usr/lib around just so that in the future, ccache from 32 bit images will just work. Signed-off-by: Fam Zheng Message-Id: <20171018073841.30062-1-famz@redhat.com> Signed-off-by: Fam Zheng --- tests/docker/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/run b/tests/docker/run index 642084bcb8..9dd362bb98 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -18,7 +18,7 @@ fi BASE=3D"$(dirname $(readlink -e $0))" =20 # Prepare the environment -export PATH=3D/usr/lib/ccache:$PATH +export PATH=3D/usr/lib/ccache:/usr/lib64/ccache:$PATH =20 if test -n "$J"; then export MAKEFLAGS=3D"$MAKEFLAGS -j$J" --=20 2.13.5