From patchwork Fri Jun 1 16:20:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924170 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="aklLZtfW"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8l52PR9z9rxs for ; Sat, 2 Jun 2018 02:23:13 +1000 (AEST) Received: from localhost ([::1]:56538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmpa-0006rj-SQ for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:23:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnb-0005qX-ON for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnZ-0003mb-Ca for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:07 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:33729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmnZ-0003mH-4X for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:05 -0400 Received: by mail-wm0-x22b.google.com with SMTP id z6-v6so5932796wma.0 for ; Fri, 01 Jun 2018 09:21:05 -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=2r98Y7OHPfwysJDrA+JLdJmr2BmHgTOzLxul5gFIrME=; b=aklLZtfWxRZkcmnkoytPoel9vd57v7c25WAm1wB/BcRFw9Z6vQk1x2jJ+UkGMUtt1h loriniRRJF40CB4K1+BDaKsveZgydr4caBBeRGoiPYU2xYpn2RFzpeEPgRFOR25vZEjH TZrJ8FG5ZhEW0XTbuiI3J9l1ouqpAyM5BEftg= 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=2r98Y7OHPfwysJDrA+JLdJmr2BmHgTOzLxul5gFIrME=; b=uOo+14u89dcG2ZvYC1WZpucPU5fO+JFSkKpgZH9gWhJkiBCV4IegF2iHieGTQGHmL+ 2S7k4XHSbrU4C/hsNMDSAc89V4zx9VO1j/ssznIoYDY/aVXVKaoS4CltReTRlwWoTxyU GUM0btSPUcaDSVnAYYmJwQJ3y+Lb8qLn0sS1ZPU8d2h0o8VVh7GDif0IrDYFE18xmHLz JZAWuLFy+X6TPoEHos2Iwmi2HxMHGXZjX57nOZZbZGUMEM3GaXEFKNqoiVg2+4PfP9HR qL+6+G+fQY/aRZ0VYedLXMsWdN6t+vnCy5u7EESKwVPGnhmb7D5wRNYNhkK+/7lSAJJ8 LYDw== X-Gm-Message-State: ALKqPwcxjUU/u9Cia28NXYcMwaAVYOHmW5hSpRlGJaG4NBFD3HR01GGz ALS4QVFWzhWwmlsPh7EX/CW7cQ== X-Google-Smtp-Source: ADUXVKIga2NHL4TvyaZKds8iwgo0laX/kAE0CwKU/A9Re9k5y0C0Pv5AAvikvDYqInWRHse3c7LRIQ== X-Received: by 2002:a1c:8ec1:: with SMTP id q184-v6mr3355703wmd.104.1527870064036; Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x16-v6sm1772642wmc.42.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E2FE53E024F; Fri, 1 Jun 2018 17:21:01 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:55 +0100 Message-Id: <20180601162101.895-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22b Subject: [Qemu-devel] [PULL 1/7] .travis.yml: disable linux-user build for gcov 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Currently the default testing doesn't exercise the linux-user builds so there is no point spending time building them. We may want to enable a separate gcov build once linux-user testing is re-enabled although it's likely to report very low coverage. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index c1e99237b2..aa83e9aed7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,7 +74,7 @@ matrix: - env: CONFIG="" compiler: clang # gprof/gcov are GCC features - - env: CONFIG="--enable-gprof --enable-gcov --disable-pie" + - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --disable-linux-user" compiler: gcc # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" From patchwork Fri Jun 1 16:20:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="itOSwNrt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8ny4GS6z9s1b for ; Sat, 2 Jun 2018 02:25:42 +1000 (AEST) Received: from localhost ([::1]:56553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOms0-0000UG-4m for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:25:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnb-0005qe-WB for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnb-0003nv-3r for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:07 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:34199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmna-0003nO-Tj for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:07 -0400 Received: by mail-wr0-x234.google.com with SMTP id a12-v6so1919069wro.1 for ; Fri, 01 Jun 2018 09:21:06 -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=2hFmA7fQZWr4dwOWmuWOiVm+X2Jt5Xl0qWAqN8j/OJQ=; b=itOSwNrtJgnesTSrHidEPGLWKJIHiYOBEy+WbyZ8ssT9xb/ysReesC9hvoiKAcoYnZ +oV39JGg8IBRCOlDzNCMWurL7OzPiukR2eGqnRT6EMnEuxxzJzRzykaxMh7cs5pXFt1t PQfKFTLtgGWpNrzNNU6afTMJHuTPZbdy/hJkI= 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=2hFmA7fQZWr4dwOWmuWOiVm+X2Jt5Xl0qWAqN8j/OJQ=; b=f3oi2nEsxbLcfwbvyQBsI40rOIe3ZqVYeFSWuDXBE+LYxYAvlLfFzRbtn4IS3OhT0u /oJLOfR9PAWTp/m8PoxfhKfzJ+UPknzkfduYZktglwdNxtTAs6aIMxrqatMqU8LN15zQ ZMJQ0upoHgJ/1tytZ2vyMV3TPJaUVTICvV0/rrViL5mAH4Jk7lWlFvRGDX3wLFuzpFPo IuGrvJE4BazfRV/cONYao+2rqiIm4R/Vp4AzyxCCL6CFeTHvFCn5uf0LIc73LlCYSuxz 5PLiD9ez0C2swBKJYOTFETUwoUnilyY3Xodk2uoB/Jv7ryTdC6kUL5oSjrdzA4oMt5lX HLPw== X-Gm-Message-State: ALKqPwf29DvyVGJV895fwrJf3Qckcq9JAAGeuvTf0+iXureAgYpxFZXd ZeUAlPIWeFaF7wl2xfygT5gIqw== X-Google-Smtp-Source: ADUXVKIOdsJGt5sqiLE0ZUschKK7e4q60HY1+kV8kxLD6OtXZilVIhtie0m0GjEhRHSaIZtqnreFwg== X-Received: by 2002:adf:979c:: with SMTP id s28-v6mr9723315wrb.28.1527870065898; Fri, 01 Jun 2018 09:21:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i12-v6sm23852296wrn.55.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 00EF93E0274; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:56 +0100 Message-Id: <20180601162101.895-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::234 Subject: [Qemu-devel] [PULL 2/7] docker: sort images list displayed by 'make docker' 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé we can now directly see different version sort consecutively. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ef1a3e62eb..50cd51a54e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,7 +4,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_IMAGES := $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))) +DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) 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 From patchwork Fri Jun 1 16:20:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="M3J9sEHq"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8sB0MQ4z9rxs for ; Sat, 2 Jun 2018 02:28:30 +1000 (AEST) Received: from localhost ([::1]:56569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmuh-0002sy-J4 for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:28:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnb-0005qZ-PA for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmna-0003nS-C7 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:07 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:52662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmna-0003ms-5r for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:06 -0400 Received: by mail-wm0-x231.google.com with SMTP id 18-v6so4074659wml.2 for ; Fri, 01 Jun 2018 09:21:06 -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=W/5FuYLvXQlRx+11mRQ45O0pjjXorJt3qjj+60jMz20=; b=M3J9sEHqoA/owB5rz+bl3v/UjvxBIWjB1z8yI1oRESsssQO8o4tBmsi7Q46JHANgpy WvKIMxQunJh9pmev5SonlxVEtDiMDIu3fc0C7qsOHclQQ+u58lJXLvt4wcVwjuUum3US 50kMM8dZ9oOAzk+AFnE2frW+sWHJEdO0AO1DU= 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=W/5FuYLvXQlRx+11mRQ45O0pjjXorJt3qjj+60jMz20=; b=c/g+eGm3T5CBbtswqmn/Q4afcKuhi573DR9s0VTGQ9kCbctMJO0riiedcrJK65sGu6 GVq4dl0TAQJchE5RWxkxkyWJdnbpBAd2wl+eU3rmseJW09nqdRQdVr68ImFb1yNzc6JC eOkkCxmt+610PKCPSGIKadauKfNAzb48g8CMiKj5t7pL28wAW6f+5zMd0E14unX4po/X bheG6u2dF6aqwYfLcGdgc8CnTeSXKOR7XGgfMNhatPqYJWhL56Vpc6j8mLcdOPQqMi7Q VjIli0vqHU7NGJZlIp/FLFnIQWSOe4AlTtsSj3zIMtdJE6mRkXzWkSotZHEHyy384C3u FQvA== X-Gm-Message-State: APt69E2nfiOQZgOMrQJKG1Ma+z0kXZKc1leJUF2qPY8YbtI8SYTofUBl B03JNNuwxJ8BgPbtwyNiNNMfuw== X-Google-Smtp-Source: ADUXVKIeWxuIQNaOjBo/iIT2cUHnTs0okPMKKN9AoyJyHbrdKRo18HGVvDYal6nGtayBKTH7tU86eQ== X-Received: by 2002:a1c:9595:: with SMTP id x143-v6mr3350820wmd.146.1527870065127; Fri, 01 Jun 2018 09:21:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l69-v6sm3520225wmb.30.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 137273E06E0; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:57 +0100 Message-Id: <20180601162101.895-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PULL 3/7] docker: do not display deprecated images in 'make docker' help 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé the 'debian' base image is deprecated since 3e11974988d8 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 50cd51a54e..31f21a43f5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,7 +4,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) +DOCKER_DEPRECATED_IMAGES := debian +DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) 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 @@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe docker-image-travis: NOUSER=1 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES), \ +$(foreach i,$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ From patchwork Fri Jun 1 16:20:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="O0VvwKy6"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8jc5gnxz9rxs for ; Sat, 2 Jun 2018 02:21:56 +1000 (AEST) Received: from localhost ([::1]:56533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmoL-0005rH-T4 for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:21:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnd-0005qf-Do for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnc-0003oo-4h for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:09 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:56090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmnb-0003o0-UW for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:08 -0400 Received: by mail-wm0-x22c.google.com with SMTP id a8-v6so4056922wmg.5 for ; Fri, 01 Jun 2018 09:21:07 -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=77ZOxWc9Gyj9168gPwLW44QXKnH+xdWFrCZIv8nlwI4=; b=O0VvwKy6VHn3AIBlhr/fAmMlE8CiTnMJONVsKLTErRPfJHE3m+d9vVQjTMoZ5SBxuw VOK9buLUK7FFBsVKnl/Pj8jqpSjydvCWVBcj97CqzR3DKF9f0XWupeRSH3k+xE3nH9nw nRTpvKpB1BdiMbIL+dNVNB5e8b/5xytYgtCHU= 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=77ZOxWc9Gyj9168gPwLW44QXKnH+xdWFrCZIv8nlwI4=; b=PmAJEuzi8j6KTjHxFJgT+Jr3q9Unm7tdPHJ2w1EXNhaE6g3l1ZMSuVf6i7rQAGCCaM 5iRxNXcFq3iZYX+WXXcCiNpg8UACUMKWfo5qMzlNv69Xgteke6lInTFEht0nYtNaHyIj pNsOPt0OGff9mknJjuWG2O93NX/LeondI8cTae4uJgZfzpZGsuG2kxN7xwAb5cV/S5rn JZAceIk12TZnDPpFejnIPjivx3b4fAtj3b9gxNHs46sq6o5wvk3UK3LT3F0drSQdVFWN 7/b4YsWhLeLwprkXtd9hdyUiE85+O9RNPXBuZ2TW47IFuLpUmQ5IKP0QTzNzx2+HKCbV yESQ== X-Gm-Message-State: APt69E3y8cuYBAKx+2mT96xRMT+mz5aS5POB172koksaR89ds5f+Xnpz k/EExTBo97kPkERP0vEt0MT6zQ== X-Google-Smtp-Source: ADUXVKKYAhMO6LwmzUrQPW3fH5MdVZTASazyFEJlTwbQbO+SHwu2jnthe4o06XLND0E1aisR35+zlQ== X-Received: by 2002:a1c:5ec9:: with SMTP id s192-v6mr2976240wmb.54.1527870066866; Fri, 01 Jun 2018 09:21:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o12-v6sm56845304wrf.30.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 25E103E0703; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:58 +0100 Message-Id: <20180601162101.895-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PULL 4/7] docker: update Travis docker image 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is still poorly documented by Travis but according to: https://docs.travis-ci.com/user/common-build-problems/#Running-a-Container-Based-Docker-Image-Locally their reference images are now hosted on Docker Hub. So we update the FROM line to refer to the new default image. We also need a few additional tweaks: - re-enable deb-src lines for our build-dep install - add explicit PATH definition for tools - force the build USER to be Travis - add clang to FEATURES for our test-clang machinery Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfiles/travis.docker index 605b6e429b..c5ad39b533 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -1,8 +1,13 @@ -FROM quay.io/travisci/travis-ruby +FROM travisci/ci-garnet:packer-1512502276-986baf0 ENV DEBIAN_FRONTEND noninteractive ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 +RUN cat /etc/apt/sources.list | sed "s/# deb-src/deb-src/" >> /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autoreconf gdb strace lsof net-tools -ENV FEATURES pyyaml +# Travis tools require PhantomJS / Neo4j / Maven accessible +# in their PATH (QEMU build won't access them). +ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/clang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +ENV FEATURES clang pyyaml +USER travis From patchwork Fri Jun 1 16:20:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jdAHgqXb"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8ms4w9mz9s1b for ; Sat, 2 Jun 2018 02:24:45 +1000 (AEST) Received: from localhost ([::1]:56546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmr5-0008A1-94 for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:24:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmne-0005qg-CG for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnd-0003pL-0T for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:56092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmnc-0003os-Qn for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:08 -0400 Received: by mail-wm0-x22e.google.com with SMTP id a8-v6so4057003wmg.5 for ; Fri, 01 Jun 2018 09:21:08 -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=WMZx9cLMDoTQDD1KEPu2oBxCCnqL/CfcTGdQR4g6edw=; b=jdAHgqXbnyZVRFHIFGZr08PFHGw5EU0d6dlaTOzOyuAAlYmjSIrNsywTRtGVQ2WPm1 qYS8FdalQIuLMf9F+XP729GSaZesQg3NSCQ0IYW6PSQtR/xEQC/ZfxQdQmB9dGi82MCf PNxgko8Wt3BzGblZGMGR9MgkUFF8FO2+Eu5RM= 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=WMZx9cLMDoTQDD1KEPu2oBxCCnqL/CfcTGdQR4g6edw=; b=HC7WUEpFHAA1p2sHJt7cQVWsXK8M6JTfHBchsuFMGHPpSEMLeeuQwt6f67jCzVJzAX xdz2xBEUWQqALjaZBEYURDwfRCwz1I4U+FI71a4eW7KF3+4g7Xyk1MjFdY451x9Ipzjj 6KTe9X2YpH21a9j093Uuy1U6rlbvPcUqS0UxPAFMyUdr8D0sJ+SGvgXS97WwRMBnwJr3 YOUV35wg2w8eUG6Eqvd3qCJ9XTL65B3iUM57c99vuZeY5ug+mitpZXjfxqUx97EogyLJ H1pC5nUdg7swGCzjqkhEgXB2OCYHt4KjYjP2f4GPFnXrnjdnB1T9jJj2qbyTo5hr4scG A9vQ== X-Gm-Message-State: APt69E2fISayvtl4fWWzjR7UX3AlyTx+udBK5CJrDtB/XLcpMC6nod95 u4zzEi324iBbFAGqtFK4Z492JQ== X-Google-Smtp-Source: ADUXVKLfVCnUyUbBCL//7OMWl9U6BWzQRLvc6BpNuUE3UXblAIVS6mLcdX6lUoqcrJvlacLMMAXIkw== X-Received: by 2002:a1c:bfc8:: with SMTP id o69-v6mr3445969wmi.8.1527870067714; Fri, 01 Jun 2018 09:21:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l5-v6sm21909737wrn.92.2018.06.01.09.21.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 38A1D3E075B; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:59 +0100 Message-Id: <20180601162101.895-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22e Subject: [Qemu-devel] [PULL 5/7] .travis.yml: rationalise clang testing 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As Travis includes Clang 5.0 in its own build environment there is no point manually building with older Clangs. We still need to test with the two pythons though so we leave them as minimal system only builds. We also split the clang build into two as it often exceeds the 40 minute build time limit. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index aa83e9aed7..f91db3ab1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,8 +70,10 @@ script: - make ${MAKEFLAGS} && ${TEST_CMD} matrix: include: - # Test with CLang for compile portability - - env: CONFIG="" + # Test with Clang for compile portability (Travis uses clang-5.0) + - env: CONFIG="--disable-system" + compiler: clang + - env: CONFIG="--disable-user" compiler: clang # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --disable-linux-user" @@ -95,70 +97,13 @@ matrix: - env: CONFIG="" os: osx compiler: clang - # Plain Trusty System Build - - env: CONFIG="--disable-linux-user" - sudo: required - addons: - dist: trusty - compiler: gcc - before_install: - - sudo apt-get update -qq - - sudo apt-get build-dep -qq qemu - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive - # Plain Trusty Linux User Build - - env: CONFIG="--disable-system" - sudo: required - addons: - dist: trusty - compiler: gcc - before_install: - - sudo apt-get update -qq - - sudo apt-get build-dep -qq qemu - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive - # Trusty System build with latest stable clang & python 3.0 - - sudo: required - addons: - dist: trusty - language: generic - compiler: none + # Python builds + - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.0" - env: - - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 - - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9 --python=/usr/bin/python3" - before_install: - - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' - - sudo apt-get update -qq - - sudo apt-get install -qq -y clang-3.9 - - sudo apt-get build-dep -qq qemu - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive - before_script: - - ./configure ${CONFIG} || cat config.log - # Trusty Linux User build with latest stable clang & python 3.6 - - sudo: required - addons: - dist: trusty - language: generic - compiler: none + - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.6" - env: - - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 - - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9 --python=/usr/bin/python3" - before_install: - - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' - - sudo apt-get update -qq - - sudo apt-get install -qq -y clang-3.9 - - sudo apt-get build-dep -qq qemu - - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - - git submodule update --init --recursive - before_script: - - ./configure ${CONFIG} || cat config.log # Using newer GCC with sanitizers - addons: apt: From patchwork Fri Jun 1 16:21:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="gITtp5LT"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8wc6pYTz9rxs for ; Sat, 2 Jun 2018 02:31:28 +1000 (AEST) Received: from localhost ([::1]:56585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmxa-0005Nc-Gs for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:31:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmne-0005qh-KC for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmnd-0003q0-RU for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:50205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmnd-0003pK-LR for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:09 -0400 Received: by mail-wm0-x22d.google.com with SMTP id t11-v6so4085848wmt.0 for ; Fri, 01 Jun 2018 09:21:09 -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=XUlxCEzuTe2CCBf9/HJuB6Xyi5xGBvnT1nk55zzofmM=; b=gITtp5LTCjOsmy078MyUuFlnxYAsqyMAjMrSiLVt354hpO7kRd6Bvf9cBeqr2Hyp5r RFAsXjWCuLMnh7OhkbFDPZtMAHQGIdJtoeV1L2y7sPg1F9vI2R+0sZmazR558v8Edigm DP/u3Dt5jwJJ2RK8KxWwRkRUTe6ME7fjhS6ZI= 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=XUlxCEzuTe2CCBf9/HJuB6Xyi5xGBvnT1nk55zzofmM=; b=mdR5VJyYvCzCT7capHzb2mm5ILspZZIxoUIrqGfSQSA5dFpeiFEzsaw67GoZXu1NKy YGOBL5M4HMEAwP22Ydd4aui4ZYNlHW2WOfes9EvZiJYvoqX+iaU5CEMJndlS7KZx2M2u 0kftcnXxhogsVaKKeCLFct/Qnf7rjZN9w04GoNmpxIr4L4CdP2JN34H8rIaytWQcnSbA hhP231ZcB/LPcZ7YtgRTk3zC7PsGRC6ehDBB+pfKvpSJqncvDbee6gkrMA4jt2q7wmNd ovFoc2lR5xxzArsq3NvqeJO2mNrLR8E/N11QdYHF44O5FuaVc7yNF2TgO0Q9gCJVXBRJ nY/w== X-Gm-Message-State: ALKqPweFuK/HtPj0wBuLOKPkp6VlX8Ya27mB/3IqDdbRuLKGmRXa6wCy 3eOF2ipNPYQxHrhctwHTCSpu8A== X-Google-Smtp-Source: ADUXVKJUw3dHvLAkaRd4CxAcTdVW/r2UHQKvGxwa0hzL5UwVYz0nDVW91ljOAY8LL1YZgmaxv6uQFg== X-Received: by 2002:a1c:3607:: with SMTP id d7-v6mr3372408wma.39.1527870068618; Fri, 01 Jun 2018 09:21:08 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h12-v6sm2413773wmb.3.2018.06.01.09.21.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4B2D13E075F; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:21:00 +0100 Message-Id: <20180601162101.895-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 6/7] .travis.yml: make current setup explicit 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add some commentary and make the selection of Container based Trusty build explicit. We will need to add VM builds later when using docker. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index f91db3ab1a..7197247a34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ +# The current Travis default is a container based 14.04 Trust on EC2 +# Additional builds with specific requirements for a full VM need to +# be added as additional matrix: entries later on sudo: false +dist: trusty language: c python: - "2.6" From patchwork Fri Jun 1 16:21:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 924175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Dg63eg9I"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40y8qs6rWWz9rxs for ; Sat, 2 Jun 2018 02:27:20 +1000 (AEST) Received: from localhost ([::1]:56562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmtZ-0001q4-5a for incoming@patchwork.ozlabs.org; Fri, 01 Jun 2018 12:27:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnf-0005s0-UJ for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmne-0003qx-Ul for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:11 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:52098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmne-0003qL-Nr for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: by mail-wm0-x22d.google.com with SMTP id r15-v6so4057923wmc.1 for ; Fri, 01 Jun 2018 09:21:10 -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=s4HNu+kBGSGPbJ27sRzNbDRBpU7VALK5BReguqMLjts=; b=Dg63eg9IGbV1m/qm4TwFAhOREejyAJirHx9ZXE8xfgYjmZfrA8+3wzukbIhS09Pjw8 Jcdx5hqgBq5xq0UCLKKrF+TrPJ75Kx2palGBMhfBP5XEQd5ESwxRxGtcFjlZdsSDVJ3X 2th6rbyTV295lJQJUcYUIXX43hpb69V+BmRTs= 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=s4HNu+kBGSGPbJ27sRzNbDRBpU7VALK5BReguqMLjts=; b=ly84uR/0oFQQjw7JuhOUCk8+oBDi2XppA4LZmO29YdjZDwbEXHmGSS44Wkf/0sXyHj kVd7cYK0v3uivKLiqULj7lysaaDt/9OQUlFE4eHH06Fwc6jzAuag9alqzanYPKVvXHGQ VSnp6hXEEKEsYe6htbEEntFYzFrB4ymigCn7uKMRzIUnZdYU1wG64JsN6JIPgwd3Hd92 ViSSC5HjyFYqG8LmVXh+qX8onqb7O/om8auD8dj40av7kAifASNPX77Gfa7z3tATZQLZ eBSADA1KsR86ySNAc8AmK1Lau9G279mvGKyS9MJPRZGETUEWpxzVoQe1sFZmS6adoCii xpaw== X-Gm-Message-State: APt69E1S5mJJfcU8L5+WB9vjP5rlRD/8j7idJ9VhNRnoLji8aRrLaM3e OT9pFD7NJzkR5vCVL895bxQNMV5BT4s= X-Google-Smtp-Source: ADUXVKJb6sdw9ogM8+4vP6PjpqmZTf7Hecs0OjTiKBDQMkVpWOXsfNnMEFzanrXHvz9DUsuf2HTa6w== X-Received: by 2002:a1c:8f8f:: with SMTP id r137-v6mr3005558wmd.103.1527870069721; Fri, 01 Jun 2018 09:21:09 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l20-v6sm54108966wrf.90.2018.06.01.09.21.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:08 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 5E0E13E0775; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:21:01 +0100 Message-Id: <20180601162101.895-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PULL 7/7] .travis.yml: update GCC sanitizer build to GCC 7 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" GCC has moved on and so should we. We also enable apt update to ensure we get the latest build from the toolchain PPA. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/.travis.yml b/.travis.yml index 7197247a34..814be151f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,13 +111,14 @@ matrix: # Using newer GCC with sanitizers - addons: apt: + update: true sources: # PPAs for newer toolchains - ubuntu-toolchain-r-test packages: # Extra toolchains - - gcc-5 - - g++-5 + - gcc-7 + - g++-7 # Build dependencies - libaio-dev - libattr1-dev @@ -146,8 +147,8 @@ matrix: language: generic compiler: none env: - - COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 - - CONFIG="--cc=gcc-5 --cxx=g++-5 --disable-pie --disable-linux-user" + - COMPILER_NAME=gcc CXX=g++-7 CC=gcc-7 + - CONFIG="--cc=gcc-7 --cxx=g++-7 --disable-pie --disable-linux-user" - TEST_CMD="" before_script: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log