From patchwork Thu Nov 28 15:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11266399 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B5A58921 for ; Thu, 28 Nov 2019 16:53:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BCF821771 for ; Thu, 28 Nov 2019 16:53:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eX5/whJR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BCF821771 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaN2V-0005eL-O5 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Nov 2019 11:53:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLpX-0002jL-HR for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaLpS-0005Xw-V7 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:40 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39114 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaLpS-0005Qv-Lz for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574955337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ky4mgUkth1VGZLMbQpI8WowaMsYghd71kTf+NNV3KVA=; b=eX5/whJRN8IrWfE6Sy0rOH1iJgOESmQyhPg6OAXcnMoE/gJQwqwJDt70bFA5rVD/umz+z7 03HrvOoid8uCKJATFv75a3uauMnVZyozVY6NHACMaFfiUVdpLc5ha36wA21mM61Iysxyuj Lnh2PPksQg7XsVDRv7fsOp3bYh4YFAE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-ej2vlZpzO6G-Cee_2ZFhRQ-1; Thu, 28 Nov 2019 10:35:34 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4BA756B3D; Thu, 28 Nov 2019 15:35:32 +0000 (UTC) Received: from thuth.com (ovpn-116-114.ams2.redhat.com [10.36.116.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C6F010001BD; Thu, 28 Nov 2019 15:35:31 +0000 (UTC) From: Thomas Huth To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 1/2] configure: allow disable of cross compilation containers Date: Thu, 28 Nov 2019 16:35:24 +0100 Message-Id: <20191128153525.2646-2-thuth@redhat.com> In-Reply-To: <20191128153525.2646-1-thuth@redhat.com> References: <20191128153525.2646-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ej2vlZpzO6G-Cee_2ZFhRQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Our docker infrastructure isn't quite as multiarch as we would wish so lets allow the user to disable it if they want. This will allow us to use still run check-tcg on non-x86 CI setups. Signed-off-by: Alex Bennée Reviewed-by: Stefan Weil --- configure | 8 +++++++- tests/tcg/configure.sh | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6099be1d84..fe6d0971f1 100755 --- a/configure +++ b/configure @@ -302,6 +302,7 @@ audio_win_int="" libs_qga="" debug_info="yes" stack_protector="" +use_containers="yes" if test -e "$source_path/.git" then @@ -1539,6 +1540,10 @@ for opt do ;; --disable-plugins) plugins="no" ;; + --enable-containers) use_containers="yes" + ;; + --disable-containers) use_containers="no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1722,6 +1727,7 @@ Advanced options (experts only): track the maximum stack usage of stacks created by qemu_alloc_stack --enable-plugins enable plugins via shared library loading + --disable-containers don't use containers for cross-building Optional features, enabled with --enable-FEATURE and disabled with --disable-FEATURE, default is enabled if available: @@ -8039,7 +8045,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path +export target_list source_path use_containers $source_path/tests/tcg/configure.sh) # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 6c4a471aea..210e68396f 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -36,8 +36,10 @@ TMPC="${TMPDIR1}/qemu-conf.c" TMPE="${TMPDIR1}/qemu-conf.exe" container="no" -if has "docker" || has "podman"; then - container=$($python $source_path/tests/docker/docker.py probe) +if test $use_containers = "yes"; then + if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) + fi fi # cross compilers defaults, can be overridden with --cross-cc-ARCH From patchwork Thu Nov 28 15:35:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11266421 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 376E6921 for ; Thu, 28 Nov 2019 17:03:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0D76A21771 for ; Thu, 28 Nov 2019 17:03:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="T0lIBzn0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D76A21771 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:51072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaNCC-00026w-1R for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Nov 2019 12:03:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50567) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLpb-0002mz-9T for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaLpX-0005nl-39 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:45 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:39584 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaLpW-0005b1-UN for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574955339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HhiK25DJ0Gx190woLZIgdOQi19vB1oWVhGBl5WzlQxU=; b=T0lIBzn0AfciZL5K8xZd2ogRzfbPyRN2AdRDn26jzq+4RSZsN7Goa+nwIkJk/Kf6rlBBEW C5SmUFt7qDjJhXWmj5ilXzMiHK6Ux/Q7ALbvc4yVxNg2e6hwHVxybrHNanPxtil1do/jlp ANcdbFFzfTAFj0B3fvDyBDR3kALuNPM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-13-MCsSo2XfPnyvFL6tRIEXOg-1; Thu, 28 Nov 2019 10:35:35 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96A5B8C381F; Thu, 28 Nov 2019 15:35:34 +0000 (UTC) Received: from thuth.com (ovpn-116-114.ams2.redhat.com [10.36.116.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D5CA10021B3; Thu, 28 Nov 2019 15:35:33 +0000 (UTC) From: Thomas Huth To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 2/2] travis.yml: Run tcg tests with tci Date: Thu, 28 Nov 2019 16:35:25 +0100 Message-Id: <20191128153525.2646-3-thuth@redhat.com> In-Reply-To: <20191128153525.2646-1-thuth@redhat.com> References: <20191128153525.2646-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: MCsSo2XfPnyvFL6tRIEXOg-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" So far we only have compile coverage for tci. But since commit 2f160e0f9797c7522bfd0d09218d0c9340a5137c ("tci: Add implementation for INDEX_op_ld16u_i64") has been included now, we can also run the "tcg" and "qtest" tests with tci, so let's enable them in Travis now. Since we don't gain much additional test coverage by compiling all targets, and TCI is broken e.g. with the Sparc targets, we also limit the target list to a reasonable subset now (which should still get us test coverage by tests/boot-serial-test for example). Signed-off-by: Thomas Huth Tested-by: Stefan Weil --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c09b6a0014..de7559e777 100644 --- a/.travis.yml +++ b/.travis.yml @@ -215,10 +215,11 @@ matrix: - TEST_CMD="" - # We manually include builds which we disable "make check" for + # Check the TCG interpreter (TCI) - env: - - CONFIG="--enable-debug --enable-tcg-interpreter" - - TEST_CMD="" + - CONFIG="--enable-debug --enable-tcg-interpreter --disable-containers + --target-list=alpha-softmmu,arm-softmmu,hppa-softmmu,m68k-softmmu,microblaze-softmmu,moxie-softmmu,ppc-softmmu,s390x-softmmu,x86_64-softmmu" + - TEST_CMD="make check-qtest check-tcg V=1" # We don't need to exercise every backend with every front-end