From nobody Tue May 7 16:02:58 2024 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 1506328238835196.14595831068607; Mon, 25 Sep 2017 01:30:38 -0700 (PDT) Received: from localhost ([::1]:41268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwOmQ-0005S0-AA for importer@patchew.org; Mon, 25 Sep 2017 04:30:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwOlY-00050T-08 for qemu-devel@nongnu.org; Mon, 25 Sep 2017 04:29:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwOlT-0007iB-Sj for qemu-devel@nongnu.org; Mon, 25 Sep 2017 04:29:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50872) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwOlT-0007hy-Ne for qemu-devel@nongnu.org; Mon, 25 Sep 2017 04:29:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79D834A6F0; Mon, 25 Sep 2017 08:29:18 +0000 (UTC) Received: from lemon.redhat.com (ovpn-12-91.pek2.redhat.com [10.72.12.91]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD08860461; Mon, 25 Sep 2017 08:29:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 79D834A6F0 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=famz@redhat.com From: Fam Zheng To: qemu-devel@nongnu.org Date: Mon, 25 Sep 2017 16:29:13 +0800 Message-Id: <20170925082913.22089-1-famz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 25 Sep 2017 08:29:18 +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] [PATCH] docker: Fix test-mingw 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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" Feature "dtc" is explicitly required by test-mingw, but is not detected by the run script since we switched to archive-source.sh in b7f404201e4. Since it isn't available in the Fedora image which runs this test on patchew, the way we get dtc is still from submodule. archive-source.sh takes care of bundling the submodule files already, so what we need to do is just checking if files are there. Makefile is chosen because it is one that is unlikely to get renamed in the future. Signed-off-by: Fam Zheng Reviewed-by: Alistair Francis --- tests/docker/run | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/docker/run b/tests/docker/run index c8f940de15..0fd2f358ce 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -31,6 +31,9 @@ mkdir -p $TEST_DIR/{src,build,install} =20 # Extract the source tarballs tar -C $TEST_DIR/src -xf $BASE/qemu.tar || prep_fail "Failed to untar sour= ce" +if test -f $TEST_DIR/src/Makefile; then + export FEATURES=3D"$FEATURES dtc" +fi =20 if test -n "$SHOW_ENV"; then if test -f /packages.txt; then --=20 2.13.5