From patchwork Mon Mar 25 13:20:01 2019 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: 161102 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3967058jan; Mon, 25 Mar 2019 06:23:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxn+fJKKyopciDmFKxyqi9AZQWE4eqqveq/uxAvtLiyLYUo69956rDuXy2RTNNisCBgSqmr X-Received: by 2002:a25:2a8d:: with SMTP id q135mr21621011ybq.394.1553520229668; Mon, 25 Mar 2019 06:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520229; cv=none; d=google.com; s=arc-20160816; b=d8/qgEEePT5I9mxDO9bvXwh+iOyKXFYHh/u1FnXJUcED1BZBR+3lGXYCB4Bi+oZmc6 LyE1feqUdjH4Cfo7Vmx33dTWFV5WCNGMwlXOYnfsT93r+f52vp+N25KF/+QnZo5grnST U4S6AbsSgg2ZvO6mAzSn29Xlv7SEIrEZBJ1vNOz2XUr9xTBm5Il4t9dsap/bQ5dunUfn wO/B7hBeZuawlW8axmdWCbWu9ya3mIGZRPoDBDuF+M/9yUAYva9gE4JxGIbPrpQwbler pJaCCiuBTQp/2wSb9gkDSF2OYV6FunORArAepuCacJJq1q9FoqZYZS5/Cb9/6RVj2ao4 RQZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=QN9RHFCf2CVCboyp9CCa7SVmiXpbJXd3JKc7DEwd4wM=; b=mb6AB3OQtwIYhmsdQ8aBodLkZC91XN6tXkDGEbybYpwYG2NXByy5zA2JZMT6alNo8f cVRuspaGOf6t722XptI2JCCig5Jld20a+EjX3kU0G/oQiqQtFLa0UGXPk0KdqZ1W9JG9 HjOntJaXxJABsx56sIhXSWvZzpSJPTURWbNa/kMzDhDvg2kbV7o4j+azOSXSDVF9qMz1 K9ZxcgvhUcQVf9DwvHGPdtkaVCwzYmI9jvhpp669DCdTuMGknh3FUVkDIEjfyAnaCnCY giF1Tww66aWtdWY62ntpMKuDUiCjxdstHxjqGAvOnDtSthhSragJ0MiPVzoIjnLk4hL3 sHQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ejTW8sry; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 198si9458840ywh.53.2019.03.25.06.23.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:23:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ejTW8sry; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PZt-0006Vn-3P for patch@linaro.org; Mon, 25 Mar 2019 09:23:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWT-0004Al-UN for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWQ-00052C-9V for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:15 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:43644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWP-00050F-4w for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:13 -0400 Received: by mail-wr1-x430.google.com with SMTP id k17so2157489wrx.10 for ; Mon, 25 Mar 2019 06:20:12 -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=QN9RHFCf2CVCboyp9CCa7SVmiXpbJXd3JKc7DEwd4wM=; b=ejTW8sryV/eSpuHYhp49eRyQZJpQlvQU7/YMP81Vf4QwhJaaM6Ymv7NaLchgzmAWRp HnDgDG3IUpXaZBei0OfKym4t2sPMg5BHLaAqb+CuO8Lh5KeZ+tWGA+epNdqN2HnkRPSD /cbIgY4KBodAt6B9l5KEI2Ycz8Ez7Vj3wX6qVZDkkQRglpj9TQgUQnR8XXz6aiGI4mpx o4ORUUMHO4n2hw0QpoFx122DFC/Y5GpRuwyt0LjDccHCzqienyyhVkpOuNMA8TQ9ZOTy ji1IZwCUvyLuXVV2Bgo5f7GQS2c6vgCC7CqJL4Dr/VN+xAAcI4Hp3Y5wYu0bGmIAe8KP FdOA== 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=QN9RHFCf2CVCboyp9CCa7SVmiXpbJXd3JKc7DEwd4wM=; b=A4peSxnQz2dfCVik0a8m4tSKmAzOoVDKokZvH6Ncjk24TdN2d4xC6bYAprcZHsOdcT c/JpRKjhurvLFLCTY7PgAULkMvJNNepa70s+kGzXqNLbHoHGkhILgzc5fiZfToFmnoLy 8sj9RN5ryp1PCGFYfGFzNCaN5s2bPD5ZODM7rxuaWJcOgzGK2YPpAz0Bakz/liOvk5hS CqegpTDM+tSLyi2PWKcsluTzGiCOMYh9m44HdJCMAjawAeC/+h6llsFvUH8W44/ITwIB 14j6fXMPSR/QxZua5CBybfsgzXlNa0dkilyrEPIJwNc/iX1H3Jp0r+MoabWc0Rg0DKUx MEYw== X-Gm-Message-State: APjAAAUGcXiYLro1z4NiZxU/kyn/Nrwq4K4e3oh0XZlLzu0rSNKaSK1k k0p8zi7WWcCea2tOPVSbr9znNemD14w= X-Received: by 2002:adf:81c7:: with SMTP id 65mr5502823wra.84.1553520011645; Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p10sm12936022wrs.5.2019.03.25.06.20.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:10 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9AA171FF8C; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:01 +0000 Message-Id: <20190325132009.14987-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::430 Subject: [Qemu-devel] [PULL 1/9] configure: add --target-list-exclude 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: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is an inverse selection which excludes a selected set of targets from the default target list. It will mostly be useful for CI configurations but it might be useful for some users as well. You cannot specify --target-list and --target-list-exclude at the same time. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Tested-by: Wainer dos Santos Moschetta -- 2.20.1 diff --git a/configure b/configure index c5032425e6..1c563a7027 100755 --- a/configure +++ b/configure @@ -327,6 +327,7 @@ git="git" # Don't accept a target_list environment variable. unset target_list +unset target_list_exclude # Default value for a variable defining feature "foo". # * foo="no" feature will only be used if --enable-foo arg is given @@ -990,6 +991,14 @@ for opt do --cpu=*) ;; --target-list=*) target_list="$optarg" + if test "$target_list_exclude"; then + error_exit "Can't mix --target-list with --target-list-exclude" + fi + ;; + --target-list-exclude=*) target_list_exclude="$optarg" + if test "$target_list"; then + error_exit "Can't mix --target-list-exclude with --target-list" + fi ;; --enable-trace-backends=*) trace_backends="$optarg" ;; @@ -1601,9 +1610,26 @@ if [ "$bsd_user" = "yes" ]; then mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak" fi -for config in $mak_wilds; do - default_target_list="${default_target_list} $(basename "$config" .mak)" -done +if test -z "$target_list_exclude"; then + for config in $mak_wilds; do + default_target_list="${default_target_list} $(basename "$config" .mak)" + done +else + exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g') + for config in $mak_wilds; do + target="$(basename "$config" .mak)" + exclude="no" + for excl in $exclude_list; do + if test "$excl" = "$target"; then + exclude="yes" + break; + fi + done + if test "$exclude" = "no"; then + default_target_list="${default_target_list} $target" + fi + done +fi # Enumerate public trace backends for --help output trace_backend_list=$(echo $(grep -le '^PUBLIC = True$' "$source_path"/scripts/tracetool/backend/*.py | sed -e 's/^.*\/\(.*\)\.py$/\1/')) @@ -1622,6 +1648,7 @@ Standard options: --target-list=LIST set target list (default: build everything) $(echo Available targets: $default_target_list | \ fold -s -w 53 | sed -e 's/^/ /') + --target-list-exclude=LIST exclude a set of targets from the default target-list Advanced options (experts only): --source-path=PATH path of source code [$source_path] From patchwork Mon Mar 25 13:20:02 2019 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: 161101 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3966639jan; Mon, 25 Mar 2019 06:23:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqymx4d84r7I6wfJtYnkF5In/NbbADj0sYKj5uFGZPDQzPr+DzXGEPSkKZ7fQL8FM2s/23jt X-Received: by 2002:a81:3c89:: with SMTP id j131mr19632967ywa.183.1553520208096; Mon, 25 Mar 2019 06:23:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520208; cv=none; d=google.com; s=arc-20160816; b=iwGWXydLwD6pq+y/I9N/mQzNQyga4fvj1yrajOyK/FjQWxjZI8kSm81w9w1HzFYcb2 W4enGx3fnBjsLawUS1HUzOf3XYpbojeUP3veYgXdWEDEjwaLSjHBrPElWgA+7iqrt9oM 4y1ZDbTnMEweIj0rluBqw06CQKPnKONPiyCcyVxI660bxDtJA1ije/lTCFckkc3SdQO3 PR7ZMQmMvgl5+rV9KoreoQPkgABo18K9ElsDYbOGeXRRuxiHVzu1py+GYiYJvZRX/DgP CUCUt0Uhn/yD8v26xsY03oFRKQugOlhL+ZJum6BQZcSh3ipL0c6yVqdSDz4PHTQucEzF YZkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=qDnc32HCUu5Z7RLMLeM6ex4cO97cANH4H3T37v/qR3I=; b=XKDs3DvM3z9EIVPderRveEWi0hJiUyJDXPcOCo772vhpdZspsFld21rsV3sS6XAAXw Q47u7XTT6wk0WsKuEqwgvP0rgvE4RGRlzIV1HCaAdWFI6LdWuG3zavaa1mkHkg5nM5mS ZM/SL354gOUF0FCAe98XJsu10RzB4qJ4Y1UH9n/ZWyikYcKJXOnip9xl9bpkf1Zc+BCT dYqvNF4+w1eVVgbOfH7V95D0dDPXo+7+07RuKKxP1K6+JkgJZuycSDT2JbYCtn43vcOc l4vI9ROBOGL1fABMfvW8Nndjy2qM7vswBYNUPsfuEjiv2O++Fn69Ubll7XWUhjwe3Xgw qZXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=x591z4a2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t128si8401817yba.390.2019.03.25.06.23.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:23:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=x591z4a2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PZX-0006XS-JV for patch@linaro.org; Mon, 25 Mar 2019 09:23:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWU-0004An-1H for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWS-00053c-6E for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:17 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:35051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWQ-00051a-Ae for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:14 -0400 Received: by mail-wm1-x32d.google.com with SMTP id y197so9067823wmd.0 for ; Mon, 25 Mar 2019 06:20:14 -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=qDnc32HCUu5Z7RLMLeM6ex4cO97cANH4H3T37v/qR3I=; b=x591z4a2GNRMTUGVDpTos4QMHKEorbmax0M2BGgPc9v4HctD5hQjLxu61k4pnbk/o7 Q+/4kAtyghC8bOEA+xmi/V8cIcQqa9p4T1sDQLEreHSKjAeVH529I1ShgnnVz3RemAOb WKIxzxJMG8Xqg6QF/zPNLa809hxk+QJm7Z1/e9z6ask2f2po6SCDJsSELvOdfMz8sYe7 y1P7/1bRc402NE6r6H406sWh8q4rZWXBGSKvKVWaNdrK859O6RHrKn1A0BWGAGsfgx2w S/+UPfkmFWvyRLmpCoDMRV5Smn3qkrd1S8HIS6LPY+ZDJOscpMftcsHGKF8IOL0GwzZV gNTQ== 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=qDnc32HCUu5Z7RLMLeM6ex4cO97cANH4H3T37v/qR3I=; b=LWi6u23xhLEUwg3Ype0dC2lYxzuQSXeagHf0CNUViDFiq9e8F/fHM8DHd0m3zf+X47 HnvUyYy7fdlec8XOBpdCwQQDSOSmUddOHM2d18gqY3CVk5Gl3vipU4AVroe/wHJpOWGJ mmUWXmjU6V7IZD9NI9Rq1KpUV7ryoBx8FiJPMbQdIOFkwRWJYvzjZUA3YYJLBfNH3ZQC M1Ua3HwWL35FQqbq6tmLvwrvRuhCIhh2zErl0ZDA9L+VVVDILVhVR/GxYaTfuUp8TYjl c9qAvD3+uYJXNbo/shsrPYVKzYMHy4tVUvwdygwBDjFM49dAEMEz+IFLARUsd+My0w9q 0eHQ== X-Gm-Message-State: APjAAAWxycJEQ99Van4UzifpujZbYlUhtoYnmbADDHOwgQYgFPLlqXCT VExwy/8Yllj3pgrIxwJpD5n6Zg== X-Received: by 2002:a1c:ca06:: with SMTP id a6mr9995880wmg.14.1553520013109; Mon, 25 Mar 2019 06:20:13 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a82sm15943619wmf.11.2019.03.25.06.20.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A72FA1FF8F; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:02 +0000 Message-Id: <20190325132009.14987-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::32d Subject: [Qemu-devel] [PULL 2/9] .travis.yml: split some more system builds 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We define a new class of targets (MAIN_SOFTMMU_TARGETS) to cover the major architectures. We either just build those or use the new target-list-exclude mechanism to remove them from the list. This will hopefully stop some of the longer builds hitting the Travis timeout limit. Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 980fc5c1eb..407fc25945 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,8 @@ env: - BUILD_DIR="." - BASE_CONFIG="--disable-docs --disable-tools" - TEST_CMD="make check -j3 V=1" - + # This is broadly a list of "mainline" softmmu targets which have support across the major distros + - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" git: # we want to do this ourselves @@ -81,8 +82,13 @@ matrix: - CONFIG="--disable-system" + # we split the system builds as it takes a while to build them all + - env: + - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" + + - env: - - CONFIG="--disable-user" + - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" # Just build tools and run minimal unit and softfloat checks @@ -106,7 +112,7 @@ matrix: # Module builds are mostly of interest to major distros - env: - - CONFIG="--enable-modules --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - CONFIG="--enable-modules --target-list=${MAIN_SOFTMMU_TARGETS}" # Alternate coroutines implementations are only really of interest to KVM users @@ -141,13 +147,18 @@ matrix: - env: - - CONFIG="--disable-user" + - CONFIG="--disable-user --target-list=${MAIN_SOFTMMU_TARGETS}" + compiler: clang + + + - env: + - CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" compiler: clang # gprof/gcov are GCC features - env: - - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=${MAIN_SOFTMMU_TARGETS}" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh @@ -182,7 +193,7 @@ matrix: # MacOSX builds - env: - - CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS}" os: osx osx_image: xcode9.4 compiler: clang From patchwork Mon Mar 25 13:20:03 2019 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: 161100 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3966513jan; Mon, 25 Mar 2019 06:23:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOLp0k6OFhzWJIwi5ocLgZ+SkOBH1vYxjTWKdv4VVTUcBPikkJc22Pd4fK3BsWzNCahg3E X-Received: by 2002:a25:d1c2:: with SMTP id i185mr20675251ybg.108.1553520202268; Mon, 25 Mar 2019 06:23:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520202; cv=none; d=google.com; s=arc-20160816; b=ljAv/ZXXPxL/baEE+f4UrF3utjCfO6CucWBUxsOQo9pnwEPoQ4PhuaMaIrVvgqiOMg 7x3cudXkTOPevXUI8suya0dgRaJ6dIrcVoL7FJpGQxGxHz8KHlNLqGINIx7IpUj3/EKP Yi9mI+MUdK2i665CU73itANnOoW3UufUtrjyAaUCnCYj5sTfKyJRougMucQshurzeQSK PeEjCsZpx/IqFy6k49Q/nhmHLWMtK7khQEgiUf+a65SbI6Gfe9U6roBOuXnicwEq4BpB sNq0hrwNzjCv0c+SEHiKnZ/6SVHdbPBqF16g+WoRi3f7JYBW6HcgBlI+kTBkYw/Gys0d ix9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=h8YiBjtTfNRZtlv7nYe0z0NL7ScrgGipe3XFbLdaRaw=; b=GaEGUHzPQk1yLOgGPXjdDswu1F2j+L+owlSMj3rq4NNCzjfT4ZjQ4shJUw5Ze/7/eJ iKSnasLpGsJD5Mz5VxiQKs3WGifpbbK/oJ0vtPXywPG4mVu187gu0yAJJ3bqDr5JiqS+ 3MAJDYo5HKFg0kPN261/QY5Q72R3ZpEOXW+7/3fnU+2h4buBiHjNkcpmJFW895qp7NMe airROW+LPdKa415LZGJTwAncB2XdD1szjnQwSS3XsM7nVb4weps95RcH6ImO8Tjic0xl O1yR9bhvrMGvxUw+rMIRb9P93M+hcR9ed7Mh5ZoXxhBolB5abIvAF+DaSIJQRLAasalF c0gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bc9Pq9bQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 206si8726657ywb.275.2019.03.25.06.23.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:23:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bc9Pq9bQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PZR-0006Sc-Mj for patch@linaro.org; Mon, 25 Mar 2019 09:23:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWU-0004Am-0f for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWS-00053V-5a for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:17 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:45700) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWQ-00050v-8j for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:14 -0400 Received: by mail-wr1-x42e.google.com with SMTP id s15so10081882wra.12 for ; Mon, 25 Mar 2019 06:20:13 -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=h8YiBjtTfNRZtlv7nYe0z0NL7ScrgGipe3XFbLdaRaw=; b=Bc9Pq9bQUjdvLJv8mf5rb+YdmsmvXfB4Gz1c/bnCLFWLU5iL5ygfK6dHmzhGE7OPzx cyJwDJ8NZzydbKs6ORSYbuyEdUn9FXnb3HM3nP0RdGgG8883YglyqbLSO7kqfjgLMiCz BBYnPm2UmQRlEf2iS90zzrT5/ZdveCBI1b083LfoTlJQikxwA5+l5RQ4grbJcsf+uI0t hHvxx41uNnXRltgnbrhfmJaM2u9RtEBtt2Xe06+ajZJUpIAUE58bMaJwFfnmdAEh4zmG dMs0YvrWd7lvcipfcWL3NtreM0IKSl/9rdtHuwDV+o9n+6HCIamMeEC9DsOmek6F2Xf7 18yg== 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=h8YiBjtTfNRZtlv7nYe0z0NL7ScrgGipe3XFbLdaRaw=; b=Ddy0yEMysMYbrSEU9eST6GiPWFIsIBNEnic/CExc5o2Ah9CaiRvjSpSFPVjH4Vcsd1 fOj6QFJ/jH2Zim+QQ6Pc3fUGkC1slE6o+CSFqb1WIiOSdRmQ7BzBm1I6reMDyiJ/Q9bj 1RjFtuGLtNK0X8yCyEnz8Cz4Epz43fgBSuvFP9Omy2Njm6nMFuWK+f+8UTJtzeq63QYJ 4SbPU8p7ux78J0+qxCkDnk1XpP/auJO3X5aWkQ3mbPNp3plsfFWl7pDiTIXm5wtn1q6k tfqi6/xAMbupzCUQJKn+dVhI7xMtl9Pnek4azrdRn3bl/fWaDt+HqAoERintw7iSgKI/ c6NQ== X-Gm-Message-State: APjAAAX5cCTzLNoRgNT4LbO+zxyXsTF52yBMKhh6LTBM7ixLE+Ckhilq bhuLPKqIDsZB1j+v2MJkn13M7g== X-Received: by 2002:a5d:6207:: with SMTP id y7mr15047184wru.60.1553520012384; Mon, 25 Mar 2019 06:20:12 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z1sm6717596wrs.52.2019.03.25.06.20.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B36DE1FF90; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:03 +0000 Message-Id: <20190325132009.14987-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::42e Subject: [Qemu-devel] [PULL 3/9] .travis.yml: --disable-user for --without-default-devices 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: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is essentially a softmmu tweak so don't bother building linux-user builds as well. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 407fc25945..3fb3dab46e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,7 +165,7 @@ matrix: # We manually include builds which we disable "make check" for - env: - - CONFIG="--without-default-devices" + - CONFIG="--without-default-devices --disable-user" - TEST_CMD="" From patchwork Mon Mar 25 13:20:04 2019 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: 161104 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3969513jan; Mon, 25 Mar 2019 06:26:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqywzukdIrzlymzP0VTsof+XWiQBJ2YlyOPKM1vnd1/hg17VN2DFbfcuW796NRBCmHvgOFAL X-Received: by 2002:a25:646:: with SMTP id 67mr19966668ybg.76.1553520365205; Mon, 25 Mar 2019 06:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520365; cv=none; d=google.com; s=arc-20160816; b=noNgAb3RAn7RLf4kNYxwJhsj0u7g/nRRAR9nsd+LnFJx3FY371OWkZWfuHUYINE5VR OP+HP+sOl/OZqP/6d8CH85pa34Uy1bhGHxw01FnLN86cUm1Av0P9M12oB/m4dDt9vAiz unDR+dtI4l6b2ILhV4FxQpl/71tdH9mz9eJ/Uw2VG9KzxU8hNcVndZmBaFVO4w3tOJ3f BvDoZyH0yyEr34S1E616AvQKbz0HIFx20mneAIjDcLgdFaSqXYJdHkeijsykB2dW8TuL btM5/C6Ib1tEwpzl1UfahuRjq4WLMNtXuPq6fu8GZXxBjioHKQEUJ8cg6rmRT/UuUaKt SqMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=OIrvxmesTmjo6ThLAzWM2yuBS3UiuNvAsu8K9L0OxRU=; b=Kgs4aBFSJdO9aCLZ/FTRygw/tyX5Py9o/bSwYtl8ZekULkewglPJSJIiotxcnfyUvC FWMbmU2S5rcLsDiUGJGTIad7mT0dBkVSNVv1499mJ5KPEobXwwzlbXzMLtjkGwxp0Nns eAbhRDdjHC0PzXJ8cClZc/17FxfY4JmdePamBA1rSqbQ/CnLc6O2R5BAPLbkYFv8PUpL /syMsrNRRbB6nYYHOMwBKFIxxjCpUrZG8Ubx3GYVtXPgMPxHhk/St4YCDjJ/eONwyKuH CeK1VlOOTqq6Rulr1UWjLyvA6xR+8kbtlVDMLAdJSAIyGCZbWW2zeTP6WndnhfH7Dx2B cpYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hLFWk27j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z1si4697820ybj.272.2019.03.25.06.26.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:26:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hLFWk27j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42569 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Pc4-0000F2-NX for patch@linaro.org; Mon, 25 Mar 2019 09:26:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWX-0004EB-Pt for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWV-00056c-Sr for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:21 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:42075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWS-00051y-4y for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:18 -0400 Received: by mail-wr1-x42f.google.com with SMTP id g3so6621041wrx.9 for ; Mon, 25 Mar 2019 06:20:14 -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=OIrvxmesTmjo6ThLAzWM2yuBS3UiuNvAsu8K9L0OxRU=; b=hLFWk27jthgd3GHb+h7aiV1ULuKesZfWp5ZLET4ua9yu4ewAEfcJmv01Ohr1fXt4b0 zCo2D9DrYs9q3727YrBRzTQzRmFRm4WHGiLSFBIqnxW9KVsq50syUfhrUvv/IQw5eg3H +p0zFd/Ex/XXK4ydkS+2JMml0Sp4w2DZBDFDU5pxqg/Wk93kDS+J9CSDIZdqKoXIzcxL SrX9fP4v8UETsmI+Olqu273S//XQY1rPn2yGvmnx/7K3RxsvScJFe5LpUafwEbe2AgSC ikKc6vLlzJCE6EDXMNydaaXcl/SSQvg5A7h3oQW5WdbK51uHUWg8S4DjqwPaZb0P4WgA 7DVw== 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=OIrvxmesTmjo6ThLAzWM2yuBS3UiuNvAsu8K9L0OxRU=; b=XnfxKPBHoFvccOwQBo+iS++hp47iJ1OLgrIvWdyhiLQwENjrC9FtVRzGga7JKgg9mu FbTA9WvoyBxl4EJw+QBGNrBCZ52tO66ICrUGv24hGnQbW8wv0v35XepAgxlXMqFn8hgn RZPlmc17mPNCq9WN1tQf3EOk88sNsLvRGgsKKP2KGlh693TOh6yaPJqgonDkLz80kpyx yraGjAtLBfmMneXzVrheG2rtVT8WiDkuz5P6dycOCa9699QgeV6D6xiB6TKTCY09o/WV 4FQ9HwwU/IvhZ0xF51WorCeUwmJ4FnXUFxjTDgmi79W4pnu+vD3B1v4ARMcaJAcPvek0 xDUg== X-Gm-Message-State: APjAAAVBrk6TPEe2ehUuR1fLvGbC3e/XQLbR1mTdfL0/lT26ApNBxqEK s1HAIDVeYqJdeM3L+4u+RxwznA== X-Received: by 2002:adf:e3c6:: with SMTP id k6mr15535345wrm.319.1553520013722; Mon, 25 Mar 2019 06:20:13 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g19sm2763841wmh.17.2019.03.25.06.20.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C10091FF91; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:04 +0000 Message-Id: <20190325132009.14987-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::42f Subject: [Qemu-devel] [PULL 4/9] .travis.yml: reduce number of targets built while disabling things 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Stefano Garzarella Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This build keeps timing out on Travis and it's unlikely including the additional guest front-ends will catch any failures in the fallback code. Signed-off-by: Alex Bennée Acked-by: Stefano Garzarella Reviewed-by: Wainer dos Santos Moschetta -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index 3fb3dab46e..2e06aee9d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,7 @@ matrix: - env: - - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-user --disable-replication" + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-libusb --disable-replication --target-list=${MAIN_SOFTMMU_TARGETS}" # Module builds are mostly of interest to major distros From patchwork Mon Mar 25 13:20:05 2019 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: 161107 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3973772jan; Mon, 25 Mar 2019 06:29:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzZo5aTpF17SgEPpFAO4vhwuilg3L+fhgEymwa8Bq5Z9g8+6UISc3WjAw+73f3BTFv6kH9u X-Received: by 2002:a0d:db91:: with SMTP id d139mr21301245ywe.418.1553520594239; Mon, 25 Mar 2019 06:29:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520594; cv=none; d=google.com; s=arc-20160816; b=veAN64a06WYRGf2t0qOYJeGwtKrowfj1Wb5q3nIXlFYWTfOEqizObZpN1sLB5m8jlz GNe4FN8Rwf0b0nQ9hqFU497cxJ6SxxRWWRPqTzzrpoiky5JOcvLvRnnxtnQKFU3PKD81 eWqCRsH2cPkEBHOQC1glEuPzlOLjkTD44MeNFF2xAw2GTdTFEKzL3st0eNUMYoQCUp81 f7vw920gWy+T+InF6l2Eq750Gh3IHcTCGkdaIaNRwrPqPbefT7xW9RSukSybKqKSUEFY A4CA6kQyCzWWEOpOS3y3TvXCUBRLvp5BAB2czWWxgvTeDV406AQULq+IGT/IIbPIJj8/ iCNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=EGOUySU3oEg36PbG/F+G0OVYEr7qHK8rTzrFqRq14ag=; b=IEwYdpzvbZeldwptAX1E5mH0/LMsMbOHBh7VsszFxoSuFGo6/bmWWHIWEPtjk/4MDb u8XbNicvKpIVzznvc+ae0LGhM0u5Oep2B8WrozEn+DCFjO3eE8QlcpE50be+y44PeNGJ rKmi1LsTvLwhMPqj8OpzpYvg/+Jt6YaYvRr5XrUnME9OrTuDK8ihh4RXDHHMoYIs/JMK 4SPAxm39FXuUIGDvzyc3VbSxPTD6oWS4k6qBN7lIsD2pN63B59WKA+aDf3pTm/JP79u1 HaDpusOYHWr8v3IqSi6dKxSzrm7b3gQLnDGXTQMIRhGloQZS0wBdsWOO/yAB/V8ljEwR hrng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dCgwJwL4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x189si9611379ywc.338.2019.03.25.06.29.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:29:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dCgwJwL4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42609 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Pfl-0003ki-NZ for patch@linaro.org; Mon, 25 Mar 2019 09:29:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56888) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWg-0004Ij-0l for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWc-0005EZ-8k for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:28 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43640) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWZ-00053H-AE for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:23 -0400 Received: by mail-wr1-x42b.google.com with SMTP id k17so2157764wrx.10 for ; Mon, 25 Mar 2019 06:20:16 -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=EGOUySU3oEg36PbG/F+G0OVYEr7qHK8rTzrFqRq14ag=; b=dCgwJwL4XkpbMjLMNtUj9QiVwduCswlXmiYWrkXCrDxn+lgvsgAGAEJi+oa6Ms96Bh 74nV6jjGZfhEdQYw2S8Ta+7JbKyDiX8fdkXyLamH5mf9n07UNbYwZagGqBwnAlSVl79T Njx/UDXrFmOC25b2Hy0kntX7UcGlsklDmnqnDsTr6Nf6+kcfU7IzGuqsIODjlTyMTZMu O2r++X0cNAwgUGBKejQu6AUXQjlxB3xPZsmEKuyagpyxRmGIt3JBz/1A2hkxTQsRIbfa 4yw8YBB6obDRZKM+zzkECOs7XU/Vs9vMiNNuVrikLTfCLyk/a1dBcrAI1tJvZMNormew Zh8Q== 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=EGOUySU3oEg36PbG/F+G0OVYEr7qHK8rTzrFqRq14ag=; b=jBu7klueM7YCofFbLa7gzBOEpQJuohmTIZHVSDWHyDam0iKTFg3khnTGKgpEXXlN2y LgLR5Mc2fsIfD9qach7cz0zI3xXnOknglmntxuZCsRpcws9YFBqBhPKO82KDUbOH4pjI ZH0JcCqRb0fnFJG8y6JUJ6qrf1IOIzX8EbbnfEWoVk7rIUSdz5hXxVtWXqYTcPL46hBX CpDmPsiXlrp1+65DZw1CJfQLJT1/6t/iuhWdaxc7qrKIa3Z66dqVmF1+l1z1IRpWBBH+ +F9zkhckV80L69T+tWMZHUlUnjFtnfqrIxtu+A6FB3baTV7nYvaJ9UJ+GO3JU9bLxYkT MbIw== X-Gm-Message-State: APjAAAWDjS+JlULsCUepUheeuG8C45O4FordnGuIi3RySB6/DkKzwWGp LcHjqmT3fT79JLsGD3rR65dhng== X-Received: by 2002:adf:e4c2:: with SMTP id v2mr12411771wrm.124.1553520015411; Mon, 25 Mar 2019 06:20:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r16sm3416765wrx.37.2019.03.25.06.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D339E1FF92; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:05 +0000 Message-Id: <20190325132009.14987-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::42b Subject: [Qemu-devel] [PULL 5/9] target/mips: Fix minor bug in FPU 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Mateja Marjanovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Mateja Marjanovic Wrong type of NaN was generated for IEEE 754-2008 by MADDF. and MSUBF. instructions when the arguments were (Inf, Zero, NaN) or (Zero, Inf, NaN). The if-else statement establishes if the system conforms to IEEE 754-1985 or IEEE 754-2008, and defines different behaviors depending on that. In case of IEEE 754-2008, in mentioned cases of inputs, . returns the input value 'c' [2] (page 53) and raises floating point exception 'Invalid Operation' [1] (pages 349, 350). These scenarios were tested and the results in QEMU emulation match the results obtained on the machine that has a MIPS64R6 CPU. [1] MIPS Architecture for Programmers Volume II-a: The MIPS64 Instruction Set Reference Manual, Revision 6.06 [2] MIPS Architecture for Programmers Volume IV-j: The MIPS64 SIMD Architecture Module, Revision 1.12 Signed-off-by: Mateja Marjanovic Message-Id: <1553008916-15274-2-git-send-email-mateja.marjanovic@rt-rk.com> Reviewed-by: Peter Maydell [AJB: fixed up commit message] Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 16c0bcb6fa..7b8895726c 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -495,15 +495,15 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, return 1; } #elif defined(TARGET_MIPS) - /* For MIPS, the (inf,zero,qnan) case sets InvalidOp and returns - * the default NaN - */ - if (infzero) { - float_raise(float_flag_invalid, status); - return 3; - } - if (snan_bit_is_one(status)) { + /* + * For MIPS systems that conform to IEEE754-1985, the (inf,zero,nan) + * case sets InvalidOp and returns the default NaN + */ + if (infzero) { + float_raise(float_flag_invalid, status); + return 3; + } /* Prefer sNaN over qNaN, in the a, b, c order. */ if (is_snan(a_cls)) { return 0; @@ -519,6 +519,14 @@ static int pickNaNMulAdd(FloatClass a_cls, FloatClass b_cls, FloatClass c_cls, return 2; } } else { + /* + * For MIPS systems that conform to IEEE754-2008, the (inf,zero,nan) + * case sets InvalidOp and returns the input value 'c' + */ + if (infzero) { + float_raise(float_flag_invalid, status); + return 2; + } /* Prefer sNaN over qNaN, in the c, a, b order. */ if (is_snan(c_cls)) { return 2; From patchwork Mon Mar 25 13:20:06 2019 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: 161103 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3969419jan; Mon, 25 Mar 2019 06:26:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqyfpeA0sBENH4UZ67arFF82msZ9/Prycin/iaiZsKnE0DXpNm1xh5+A395Dy+Aga+AI3pwS X-Received: by 2002:a25:65d4:: with SMTP id z203mr20223692ybb.370.1553520360087; Mon, 25 Mar 2019 06:26:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520360; cv=none; d=google.com; s=arc-20160816; b=a4gd7xmSuam4Lqj8axbrZicSboTfD27r8joxXcAH56/S2O9dcgQstQbaD/QFs49tuR vUZGWAfcq2CrmCuu86kWlPnc3UETTKB0FBwYC77YIiP+lEF1unNYJ6rLxibG2yiW62Xh UltEiAQE1Qt0VvSNNgMWkDOsAP92j/ewW6lJDnRxOKG6DCDnpYJZ/Vq+T2GOzWrC0kV3 457j0GBWGXToUx7JshqOANrlj8xGYlbNx9MfYmOjKXilJFSfvo0Nb8zZMOb7I8Dt/yYJ 7nUNec8Umy0nXzhGrY4sOE9ix4Vif6fnMop9Adfuoxgi9mkTxAMGJdnsoS4qFjijjmDY gArQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=c1aVuJd8adxgw3j3f84WFBDQvPzcBUzxKhHsQiyR778=; b=cqL3xsHELtxle4OX9OVEiAuPDF6BHPILl1BRpX8ATLt+fUMCKhELmOs5Zhy9kp2g1N Jw746XakKGYPKDYJyMRMB+gk1rFb9S3nFuojfX3cvxD9AhPlGFkn0sAA56fdHiPKYT3e FsVcXgGDxxpkb+dptuoclTAdYvdGaitvf4PPjEfE4qkCfw1QXZrkfKdON6iaf6L0t6Fm gTfVt9aC3HcxiiFZD0CAjFiQjxXLkx4oomCrtk1NQPMRAOQ0yxQ39gxW1H0RIH6qfnEx xPPFnmWc2NQHJik80ObMRmGlli4xaVr8ZZKI6+U5pluRrYTGfh63clf6zrrIUQlcOQue zKEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cvLo4M5h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 145si4627149ywe.301.2019.03.25.06.25.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:26:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cvLo4M5h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Pbz-0000BY-Jl for patch@linaro.org; Mon, 25 Mar 2019 09:25:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56864) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWd-0004GT-F8 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWV-00056i-UL for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:25 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWT-00052l-VL for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:18 -0400 Received: by mail-wm1-x343.google.com with SMTP id f3so8922408wmj.4 for ; Mon, 25 Mar 2019 06:20:15 -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=c1aVuJd8adxgw3j3f84WFBDQvPzcBUzxKhHsQiyR778=; b=cvLo4M5h4HIk0LFJwT9Muq2JFOwoDSgzJt9ijXnzdStLiBe8jX8Pv0IbpWE79IS1L6 xLCdsFEAJz58VJOdceP5RzQxrQs7VtfhTXaqJNlCfF/U0DuDLvwF+GYqu/HAM4UjRICm pmhnzYwZZ05l+AFdSRBTo49A0xoFDDO9hRT8uRDdGqwR8fTqatoXy09BFFukHEAx6KGW 5aNycoGBj8YdzsccaGkFD99M1db2v33UGiMNQxbpz9sQ8Vz+21j8r86id3YM0o2GC60N LZFv4E2/J5F1ns71aQD5nj2TMMD7IacE908GMYbusxwtGK5FcateEPvT+1qX2i6Z+V/9 3O0Q== 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=c1aVuJd8adxgw3j3f84WFBDQvPzcBUzxKhHsQiyR778=; b=tmc8lDrfL4wRQfUr0F99Aw4GJD9t5FVsJjoHN6P1YxtnIBmqwVCgFtLDZ7n0BG3Btn tlYLA4tcNgX2N+9omHTNZnXRCpCETw/tUkMbUbNJjiCV+h0l4si2SAvMzgD9efjugrE9 eNA7K9Rl4tHClie2cVVI6IvtM4VH0GGg5qFK1sCH8tvVpn4l2CtTRz2t7HjDLY9EyZqR h0hYnAsN/ahRjqRyT/Chx4gXgaRRlRSs8u7SH3Kz1QOQxmb7boLH1jQKz0sgfwM49zyo hvTy6D14t37Y5VBIBK1ivzduvxt9oNNnD1vHIoD12xuzrqyURPJJIr5iMKCtnbZFRJjI ykSw== X-Gm-Message-State: APjAAAV2RHviAXbuRUYgy2ecm374vXs4k6UH7awlQ3U/GmH9s69TY9tV U6zVvyXN4s8nZbOdD4ZMQyJcWg== X-Received: by 2002:a05:600c:2210:: with SMTP id z16mr11245411wml.57.1553520014631; Mon, 25 Mar 2019 06:20:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j1sm18628114wme.4.2019.03.25.06.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:11 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E26A51FF93; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:06 +0000 Message-Id: <20190325132009.14987-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::343 Subject: [Qemu-devel] [PULL 6/9] hardfloat: fix float32/64 fused multiply-add 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_Benn=C3=A9e?= , "Emilio G . Cota" , Richard Henderson , qemu-devel@nongnu.org, Kito Cheng Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Kito Cheng Before falling back to softfloat FMA, we do not restore the original values of inputs A and C. Fix it. This bug was caught by running gcc's testsuite on RISC-V qemu. Note that this change gives a small perf increase for fp-bench: Host: Intel(R) Core(TM) i7-4790K CPU @ 4.00GHz Command: perf stat -r 3 taskset -c 0 ./fp-bench -o mulAdd -p $prec - $prec = single: - before: 101.71 MFlops 102.18 MFlops 100.96 MFlops - after: 103.63 MFlops 103.05 MFlops 102.96 MFlops - $prec = double: - before: 173.10 MFlops 173.93 MFlops 172.11 MFlops - after: 178.49 MFlops 178.88 MFlops 178.66 MFlops Signed-off-by: Kito Cheng Signed-off-by: Emilio G. Cota Message-Id: <20190322204320.17777-1-cota@braap.org> Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 4610738ab1..2ba36ec370 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -1596,6 +1596,9 @@ float32_muladd(float32 xa, float32 xb, float32 xc, int flags, float_status *s) } ur.h = up.h + uc.h; } else { + union_float32 ua_orig = ua; + union_float32 uc_orig = uc; + if (flags & float_muladd_negate_product) { ua.h = -ua.h; } @@ -1608,6 +1611,8 @@ float32_muladd(float32 xa, float32 xb, float32 xc, int flags, float_status *s) if (unlikely(f32_is_inf(ur))) { s->float_exception_flags |= float_flag_overflow; } else if (unlikely(fabsf(ur.h) <= FLT_MIN)) { + ua = ua_orig; + uc = uc_orig; goto soft; } } @@ -1662,6 +1667,9 @@ float64_muladd(float64 xa, float64 xb, float64 xc, int flags, float_status *s) } ur.h = up.h + uc.h; } else { + union_float64 ua_orig = ua; + union_float64 uc_orig = uc; + if (flags & float_muladd_negate_product) { ua.h = -ua.h; } @@ -1674,6 +1682,8 @@ float64_muladd(float64 xa, float64 xb, float64 xc, int flags, float_status *s) if (unlikely(f64_is_inf(ur))) { s->float_exception_flags |= float_flag_overflow; } else if (unlikely(fabs(ur.h) <= FLT_MIN)) { + ua = ua_orig; + uc = uc_orig; goto soft; } } From patchwork Mon Mar 25 13:20:07 2019 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: 161106 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3969834jan; Mon, 25 Mar 2019 06:26:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqwE3aJamVdZgAOtepOKQLrQiF+5NY2ytTj/3SDYLIf7W7naQcCmxYq2tpV0rglZRABvxFEl X-Received: by 2002:a25:e901:: with SMTP id n1mr20028732ybd.37.1553520382305; Mon, 25 Mar 2019 06:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520382; cv=none; d=google.com; s=arc-20160816; b=NXZ9lR9jzkvHZ+0B5StuZt9Im0R6vjb4QaAGMS3rpsSlMti8VXUtqAwNv9Ml9g3mu4 1cOyTX0rMmm8K+lFIaW0d+qpsKIuZN7BQxB/cGyGRgp/QX+UE/jXOx1zRWM8X2U9MRCx q+o4D7Wmp0HFzQmTzEMPdkchgEFOiyRnxv0rXa0XZjoSxNMQimEsMbwiGedh5Oergg5e WbfretPPb2eMdx/q4RPp5CWA3cFrKwekR9FqtGA6RGscGp6w/ZrptHdvzBcckC1xx3Xi f+vVT/q0MI7TeTNpg5Ea4lY68N8aiDc9AEikaqef2Xekv1aBh96OKYsLmBHxCxYfsR8w ikWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=F4XFuQIa2qaf7k2No9yQ2dEqhPl7EUgPesP7X8lGC5s=; b=i049lX1PFfLcYtR3IdZdDyrqm4Y+fMKXRPW+ltMBykZPAFQWbq/lq4KNwc7YC62sKZ woWVRBHsAL9xoxGwET7kc5v7+dYN52vQOgJCNeXjqhDiAM8rilbJQC8t2iPES2tetA12 208VNFMQf0IE2qTaa0JdSn+VSeGtozzCmUprWgMaF8kdJaxBNEdT4Lflhd8ngBBg0Pvv w9s2DK4YCAKm3xMBJggAjPH4ANjVPkoH7aCrBvcNIL8weuZ1992NFh27BfWRCGVU3Cmd OMoQmw5/toz61A3j5G/K/GVBvOpfL1DA8Wlz/7OmGSHsFD9ag/VKRAuHJT8vVB5/xWQ9 EnAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GmEvg27l; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n126si9927451ywe.139.2019.03.25.06.26.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:26:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=GmEvg27l; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PcL-0000IJ-NV for patch@linaro.org; Mon, 25 Mar 2019 09:26:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWd-0004GU-FA for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWZ-00059S-LG for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:25 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:53189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWW-00054H-G5 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:21 -0400 Received: by mail-wm1-x334.google.com with SMTP id a184so8884601wma.2 for ; Mon, 25 Mar 2019 06:20:17 -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=F4XFuQIa2qaf7k2No9yQ2dEqhPl7EUgPesP7X8lGC5s=; b=GmEvg27lSrj6ADXBa3AjhZ13fBqUJOQgW6Fz9CkqYiLU3ywm/Y8/rxJrAWKmdbB9FH 4E98qe2AxOEfYxs2gkcRSUZ1rcKscvUe19Mj+dwJDLQq+5C9fLr9qb9rKTqmf1rjaE0d kQI8tv8krZgZUozl+6U7Md/sCsyXHJasfiN1GL7pXBs9ZQHOI4U4n8kBw1UQccTXEQFQ ew3FjGS30saadLXRUQcj/oQqosmu7x92iU9lTgC65vJ7ZhRFvuajaONZ0PY/UU9i4ZVT mAYfzZZynx6FCfDB4rqdGdp07XKIYIUHJp2tfAcUMjOMFqTe+H44/rCeWSSlD7GAZgBD 756g== 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=F4XFuQIa2qaf7k2No9yQ2dEqhPl7EUgPesP7X8lGC5s=; b=gdT2EiWETMnzeTGYQW041HwtconK+rCLGo2pjU0/ydPHWzD95I5v04AyZI4hkpEM0R TKWqIuIaWjDE96lfs1TxwwuYUo80CRTqS+s15Rdbari6i5TnaCJB+BMm1iXWnXkzqfVL ZSt0x7Ft5HTir+LcHdBcx6/21wSL3jKTZGbRBaDdLG1pl5lRP1pKYlTtuzl7eDyMzlCV Hny2MvJNg5O0x2AYUNgDFywk1CUid5TnJcxYjFNet4PHin+yXtyXIIhptr3e67n9iAEq N7FXQftfgYksKRv0+MRDtvGNLm4aCMpU62o20szrYoKSk/aofILdNZdwpUtMl0UgtoTV dAxA== X-Gm-Message-State: APjAAAVj5YebPpN9ziwNMP6ILOt8aAPmOasgmqr7b6Q8Hg488L+NF3at MWHdVKOL5oPKtUPbdVsv1OIfvQ== X-Received: by 2002:a1c:5f89:: with SMTP id t131mr638751wmb.145.1553520016559; Mon, 25 Mar 2019 06:20:16 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z129sm15114170wmc.33.2019.03.25.06.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:15 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEBB51FF96; Mon, 25 Mar 2019 13:20:09 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:07 +0000 Message-Id: <20190325132009.14987-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::334 Subject: [Qemu-devel] [PULL 7/9] docker: Fix travis.py parser and misc change 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta Fixed the travis.py script that has failed to parse the current QEMU_SRC/.travis.yml file. It no longer makes combinations from env/matrix, instead it uses explicit includes. Also the compiler can be omitted from matrix/include, so that Travis chooses the first entry of the global compiler list. Replaced yaml.load() with yaml.safe_load() so that quieting the following deprecation warning: https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190320221207.11366-2-wainersm@redhat.com> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/travis.py b/tests/docker/travis.py index ea1ef169e6..e1433012bd 100755 --- a/tests/docker/travis.py +++ b/tests/docker/travis.py @@ -17,18 +17,17 @@ import yaml import itertools def load_yaml(fname): - return yaml.load(open(fname, "r").read()) + return yaml.safe_load(open(fname, "r").read()) def conf_iter(conf): + # If "compiler" is omitted from the included env then Travis picks the + # first entry of the global compiler list. + default_compiler = conf["compiler"][0] def env_to_list(env): return env if isinstance(env, list) else [env] for entry in conf["matrix"]["include"]: yield {"env": env_to_list(entry["env"]), - "compiler": entry["compiler"]} - for entry in itertools.product(conf["compiler"], - conf["env"]["matrix"]): - yield {"env": env_to_list(entry[1]), - "compiler": entry[0]} + "compiler": entry.get("compiler", default_compiler)} def main(): if len(sys.argv) < 2: From patchwork Mon Mar 25 13:20:08 2019 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: 161108 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3974148jan; Mon, 25 Mar 2019 06:30:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvc0Utm9fMrJsxydUhuYTWbYjhuz+WhpcW7Gvbr1ROJxTIV50/G4K2NLPDP3jMRubcU63G X-Received: by 2002:a0d:dc83:: with SMTP id f125mr21678247ywe.67.1553520616804; Mon, 25 Mar 2019 06:30:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520616; cv=none; d=google.com; s=arc-20160816; b=CvXKOzdkHVk3mmOS/DDRtLY8ew5oAlezK6daP5nboChqCDYnzQRTMPHetOROaNhg3x /2nqL+PNaPrX8qvJLfItNAihRQlzSuiBbpUbxp4CrempWuyGG5bf6EL0cWEnqj6AuvZ/ asOvyL9z+GkFu1p37OEh3xkTCQDs8sRquTg++ZP78Hb/Ze8/Kq9iWymSyBbUksfheHDn JCbjWZCwWXtdenx7HV9xnji6ntNUgJ6Fbig3vxmNPwzLQpzEA3cq8fHDhjgxGTfrTmgf Rr9VWJuWrdUMBsgKde0BOZNUw50z7XBYj/Hl74sCA4cDTUriEeFU0vleCts9qa4znABL 38Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=krRqQh3qjHGwSssau/cvn2cpryiKSw9jnzrQ2xoOoYSlPIXCXzw8Oqq4aDZ5IkwTav YFiLeyNbzbtYwk0ORempz8bPLO+05qoifInJ+y2vl9hrOhr+5koCgf2AGjGWT2OBYa6/ BmVJ0HGnynhT3hcANk+e6jhCf61jG69S2jiOh4RdsicwUMUuye48VyzJiexyKzFWzPvN dTTZDhJuI5wPQ9oZKhsaVK+NkPjTWLDaFzPNALn0cpbuXCDY9lZQjKcobex9pxf9V7H8 Ca+I8E1QsumnEs518V9BUBJ3NnTMjRSffnKNBhO33OBpse4RxtNE00YxhBO3SwppCcoS /Pqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LYRnyqjg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p144si9289952ywp.222.2019.03.25.06.30.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:30:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LYRnyqjg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Pg8-0003yu-96 for patch@linaro.org; Mon, 25 Mar 2019 09:30:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWf-0004IQ-Cr for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWb-0005Az-Is for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:27 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:52969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWX-00054n-OX for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:23 -0400 Received: by mail-wm1-x342.google.com with SMTP id a184so8884631wma.2 for ; Mon, 25 Mar 2019 06:20:18 -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=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=LYRnyqjgUl5De+bOe8hyFGPgvU1XyE2y3SpIvdNKt+LUKo+XPsFuGKou4K+0JgH+HC WfP8hdVYTveBcs3wUlAKGhnhiWOB88JYix0dutvMmhC9FPQGsYdOFztOjGa5y5oJDayL NFrnmeSnbfg9MsJGRCWg6EYrzExqWRvpJHB4MQw7NV6im376RQvHBXsSjOj4dELEpJFd 9KwkphFLy+PJxQ5wjFQF1c1K8gbVuCYTH9ldb6Ysi6GHz5gfKU31X0UAEn5ecsUSFZuT 0L4A5YEMzf78JGcokmAqbAs60y0MYgD9f2fu8l0jDPls+GDRoT47kwo/C8xc3BykWgrA 70mg== 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=WboWrZHDwiX6QlMUuwtLgKLN5Cc+bEmImarIIYLXzjI=; b=eI1/Vjm/o6WNLai71tZzmIHgJ5tn0fcn1CqQWiDCjkQR6ppr+qw5xVhcR5UqeJJ2Ry szNXBnoHZlegYrhsnnSF+zsLP90kN11xGN/XBGOUraAacCFoAZPQ1bJ1HHDchP7lGSgK 229fe0qWQZheb9YMqJ0NZkBxGy+e64rF6NXNq6nxeQ5R9NzI10VD9kyJ4OH0XHP4nRuA OdQDeqfmBoMka0h1owuZ1Pzn+NBajJa9PfIloatdmTu8O4e0RidNki0Chaf/yi5P3E5/ JfG+G43bcr3H76pGD13yOfU2eMoRBiCRw6DYxsiCwJlaVz8WiTvAOPdocZhouhSY5T7Z Cjzw== X-Gm-Message-State: APjAAAViqsx6VHub+KIq3PkvetzTV+LdfeZaIR1T8i7k10LhjvWEKwTf nxy5p82Ky8lDwudIJdFFkM2cWcbqXdE= X-Received: by 2002:a7b:c086:: with SMTP id r6mr5226257wmh.123.1553520017072; Mon, 25 Mar 2019 06:20:17 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 93sm36735384wrh.15.2019.03.25.06.20.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:15 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 072121FF98; Mon, 25 Mar 2019 13:20:10 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:08 +0000 Message-Id: <20190325132009.14987-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::342 Subject: [Qemu-devel] [PULL 8/9] docker: Fix travis script unable to find source dir 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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta The script generated from QEMU_SRC/.travis.yml uses BUILD_DIR and SRC_DIR path relative to the current dir, unless these variables are exported in environment. Since commit 05790dafef1 BUILD_DIR is exported in the runner script, although SRC_DIR is not, so that make docker-travis fails becase the reference to source dir is wrong. So let's unset both BUILD_DIR and SRC_DIR before calling the script, given it is executed from the source dir already (as in Travis). Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190320221207.11366-3-wainersm@redhat.com> Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/travis b/tests/docker/travis index d345393ced..47c03677d6 100755 --- a/tests/docker/travis +++ b/tests/docker/travis @@ -18,4 +18,5 @@ cmdfile=/tmp/travis_cmd_list.sh $QEMU_SRC/tests/docker/travis.py $QEMU_SRC/.travis.yml > $cmdfile chmod +x $cmdfile cd "$QEMU_SRC" +unset BUILD_DIR SRC_DIR $cmdfile From patchwork Mon Mar 25 13:20:09 2019 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: 161105 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3969759jan; Mon, 25 Mar 2019 06:26:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxEdK/2XlOxyBzCGxa5O5aA8lSS3HABb+k4my1CbdVf6D+2eFSaALI6yz+L8zUAI4eH6QlE X-Received: by 2002:a25:5887:: with SMTP id m129mr19303548ybb.275.1553520378123; Mon, 25 Mar 2019 06:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553520378; cv=none; d=google.com; s=arc-20160816; b=cKB4/+Nd150/UETvxk1tk6i5blw5n3K28yLbrcF+YqmEFQZH2I3I/iMYhqo9S4YXUy WAh2ujrvos0via6/f2NnUfqYm36gHYMKbaY0/0LWgtemiVknfB3O+UbuAKP6tELZlwSc 9A9CGWTmxQynNd5Sy85LzrYqTAB9LT47Hq3YIj39nyrk9SKHjliR9sbUbTH1qz17DuYw 48WI6ryXzS3BdcsqNbDzF40HoXc1Mg2Dl1KfrP2u7wPt9/b1Csv5RIaVHhV2OtX73u3w e+8nWVe0ZS2gwuRcj+C4nTeBNL/sIO4cLkZ7T8Gqc1f2gSLNZj76EKS1v9KLWlTgxdPN 8HKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=CXmQWWprtwetvoQFTuvEDlOhO5UALKeTuxS3kXpPaKU=; b=KIqqIqiD6QHF266eiGode+25dXEgii4UE+BFpZa7HuEzd8RsLClDi5CAxEs5cOjJOu LHVH+RILMW3+vAGDhb6SsZP3ekV5O6UfqRRW9RAROjowM0WISn/d15/dEfpppfP9yzta GBEVF/nGaL0dHgAhEzDgfvHzTdxpj4J75OCRx/25pqNYW47NgC6npSWlDwUYNuJdWgyk iv8jZ1JsQa8yeKFueXjOafCWDiVzsFgDIAiUhvYqzlu3y9ZyKSUW9XgK+28eC9+zi365 j61f2YKtHmutvKpj2gsv5R+d7RxlU3+leD5Ce5nup7vabAmt3Vz4iHzfwIjeZQw0m0D+ OxHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vN2k6iIs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l70si9553482ybl.187.2019.03.25.06.26.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 06:26:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vN2k6iIs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PcH-0000EA-LB for patch@linaro.org; Mon, 25 Mar 2019 09:26:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8PWi-0004JS-V0 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8PWh-0005OF-QA for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:32 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38516) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8PWh-00055l-Hb for qemu-devel@nongnu.org; Mon, 25 Mar 2019 09:20:31 -0400 Received: by mail-wr1-x433.google.com with SMTP id k11so2712681wro.5 for ; Mon, 25 Mar 2019 06:20:19 -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=CXmQWWprtwetvoQFTuvEDlOhO5UALKeTuxS3kXpPaKU=; b=vN2k6iIspUD81+eDhlabiBTx2BcAs9W9cqxn1aRWu7v5/CqtdF3oh2sr+lmLdz6GYH pPVf/Dtmkk/D8Cy0ZnO+UlmFEvqPzd2HBBWo6JETR0mYcodnkfcmd0GyID49aF48dRVF LabmysDxapgOUGvmXz/i3CXjn9YVwasnCPugczXHKsQJYmJRcUkZsnsUCXZm7bSRsJBZ Q0m1Qnsc1xTHeMLyH3NbznRgCzj778Nz1BOwTs9JqVSotR6Kheaw2Rt7dEpEZj+S/wVt n8dCqKogQKVvB1IxSmrdVwcZmgy56El3sfwAS56E7tE8O0ny5246TyJKAGeb3A+eOpXl 3FMg== 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=CXmQWWprtwetvoQFTuvEDlOhO5UALKeTuxS3kXpPaKU=; b=fiNyjwN9d0ojRcFiWZi3Ly2TwxHjFDQCazBxe4L72gmx4Wfct8eyNnJCLA0LIwbz1u Gg8dOPb4ffLMAcfsevlXIvmaJOPVaYqUtkC1wPbBjcf2vJp4irGnqSkTk08IpBHN3Y2d va1d3EAvIcDeIZwoJ+Szsun3q5vEaJmcPADzvJHGbiowN9UZLPKQsN12WGECww3qib69 TOmHYNkempaIzilyEH3F/UAceinA1cNy58MgIqCFWXVMJwNnDZdMK8s+8k4dNNOrGYiu kV0IPo27SCGhIMrQc0RtEDcCX63lKKyJlGfD1Rd/YSZnbMImNVYs44ybkjktjBx5NpY1 +SoA== X-Gm-Message-State: APjAAAVvCmTq42eDnrfbdVw6KkgzybtnPu8MPZuF4KeuJBZlpsNUZqqK HxfUeNq9GpXZWWxqIdIoSbzMc28QbFM= X-Received: by 2002:adf:ea45:: with SMTP id j5mr8416714wrn.89.1553520018175; Mon, 25 Mar 2019 06:20:18 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t187sm16029607wma.1.2019.03.25.06.20.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2019 06:20:15 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 12E531FF99; Mon, 25 Mar 2019 13:20:10 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 25 Mar 2019 13:20:09 +0000 Message-Id: <20190325132009.14987-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325132009.14987-1-alex.bennee@linaro.org> References: <20190325132009.14987-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:4864:20::433 Subject: [Qemu-devel] [PULL 9/9] docker: trivial changes to `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, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta Apply double quotes and period punctuation uniformly. Signed-off-by: Wainer dos Santos Moschetta Message-Id: <20190321212528.6100-1-wainersm@redhat.com> Reviewed-by: Fam Zheng Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 60314d293a..c0e1bf57a3 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -151,15 +151,15 @@ docker: @echo @echo ' docker: Print this help.' @echo ' docker-all-tests: Run all image/test combinations.' - @echo ' docker-TEST: Run TEST on all image combinations.' + @echo ' docker-TEST: Run "TEST" on all image combinations.' @echo ' docker-clean: Kill and remove residual docker testing containers.' @echo ' docker-TEST@IMAGE: Run "TEST" in container "IMAGE".' @echo ' Note: "TEST" is one of the listed test name,' @echo ' or a script name under $$QEMU_SRC/tests/docker/;' - @echo ' "IMAGE" is one of the listed container name."' + @echo ' "IMAGE" is one of the listed container name.' @echo ' docker-image: Build all images.' @echo ' docker-image-IMAGE: Build image "IMAGE".' - @echo ' docker-run: For manually running a "TEST" with "IMAGE"' + @echo ' docker-run: For manually running a "TEST" with "IMAGE".' @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)'