From patchwork Tue Sep 10 08:43:32 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: 173491 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5541155ilq; Tue, 10 Sep 2019 02:29:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzhF7wt0BexZNUKNrsA2a/X+0taOtUvVhLbSeenvMTtdqxVdRrjEnnNM6bzvBBo9pP6SzTB X-Received: by 2002:a05:620a:79a:: with SMTP id 26mr26979356qka.55.1568107775734; Tue, 10 Sep 2019 02:29:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568107775; cv=none; d=google.com; s=arc-20160816; b=pTDe5CNeg6mb6L31xBtsiZsvENCeCI9ZVAJo5dj7YuBHIhytC1kfx/StvsYqXsafI5 dMFRvLhK3jRc8H8TmFdSXpLpBCVRIOklC4lxlhdQosGe9iIXglGC8KzbSGLxucDwF5Cs b0tkG/J+8L4Oyq3JNU5ca11GBSmmHOlMPVpUwdIeKxG9q+qHbPKihi0tf/Z/CWoOMtfC DjrlhcEESU4gE99i6QHvkpq0ORV7E4u5+OGS8DAfQjtqVyAVbVBf0wwFKJqwjde5VkCh r453DFYM/72wbdGJvgiJefaEyTKKEZUf3DtZZ3BRJja6QDyYozgvUy5HWjqo0JuqhmOF xg/A== 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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=OZfxqz45Mkawbkkm7WcOqTXH6BdZ3LupjF7X9JNa5AMat65vDccePkRPqkCVJ+iZ6F 4U5w0Z4sEzKxVfQxe6qoIY+DwOOkNQniRjJRr9FjjZ9LJ4nXugKRZkUzw65gICTvHVoA yT7UPtUFq3lUPwMMivOx2cV98/mj9sRmhaCT45pHCjHS2mO4wM9djcBFu4imKi52XZc4 cSpHdzKmSVxTF71SKESaz5Ye/BokanGJvjE9Xlg26WfrKXW/jVElCyvEh6gsOYzN0Qvs GFvWCXqMBzsdtRjQ72oPfshNfTbru5Ckj1X3345VI2fme72UDsG7XBi6gXT+IKfQN9mv seLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=p6xy5QM4; 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 t1si13066392qkf.2.2019.09.10.02.29.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:29:35 -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=p6xy5QM4; 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 ([::1]:36590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7cSs-0006w0-VC for patch@linaro.org; Tue, 10 Sep 2019 05:29:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38999) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c0f-0004jm-EX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7c0a-0004qO-6g for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:25 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7c0a-0004pf-09 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 05:00:20 -0400 Received: by mail-wr1-x42f.google.com with SMTP id d17so5727771wrq.13 for ; Tue, 10 Sep 2019 02:00: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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=p6xy5QM4x5udtOW8e/xx8zUTW6rOCAUz24/Ge+d8E9dfs2Viva8brC34jwNU2qMSsW m1cH2nmypxnOQFfA2sGSmVwcajkHGcWxk5ZpRHaWLxRZwjmy9XVL4OWpK0TqlHWUw09c Xu1Hi8WY6/6csnB/tFruKds0P5cR/+0e++V/GyK4k3A9XmDGTwyOiNDxEeMmrX/ZmssQ bTfb3JwWkmstJw8fa6zyjMKUDtH+WhtxUhOSWwCXwJfNcpvU6kvYee3u7+tgyLC56QkV bc8Adc5sYLFNlFWIsLGvq/PjSSwRqKTEb5NjbYluzSAWM48wdM3cGKd6vNgS3G+gMBPY ovXA== 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=05dnYVGGKVj+CF91WFubqktnlFwPYrggGM7CJVpX+/U=; b=fiVDq/5mtxUXQzk0nXGzNadBaH1BdX1YB27fHYJZKoyF52Wm38j37VzOFh0NWkeVf/ +aManzB/8jEts5jPEJmydTtqZei52QiEG01uWigr/wQqoJUQkIlHsqva/zyAXkEl2rDl 5l3MtvpuodE9ZdFV+P/5h5AOv3Yknhq2lmUaSPPMIhGK0s6oj+0+g3wAjRzv5kO1f+9P Erd0syUTynX+czToitYvqxHwV71Zy7xMqETZbmLTG/2s7fWijz15uyDCgfOdZeFgmwFt ILCxZnq2Fhlh6O/OvBTdVGfGk8x+VjQQZT0GCt5ntTa3/CfJOsHzG1usFjyfGoCcqtUH aYwA== X-Gm-Message-State: APjAAAVjH60+MQmwjfxKWEo0P1hZz4z2f+EMACrIsLCovn63Fw02RrZC eUAJokLcFWILkSknwsrTQFJNSA== X-Received: by 2002:adf:e485:: with SMTP id i5mr24054802wrm.175.1568106018948; Tue, 10 Sep 2019 02:00:18 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id t13sm30318640wra.70.2019.09.10.02.00.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 02:00:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28DEC1FF90; Tue, 10 Sep 2019 09:43:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:32 +0100 Message-Id: <20190910084349.28817-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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 28/45] tests/docker: avoid $SHELL invoke bash directly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" On some images SHELL is pointing at a limited /bin/sh which doesn't understand noprofile/norc. Given the run script is running bash just invoke it directly. This fixes: $ make docker-test-build@IMAGE DEBUG=1 [...] + echo ' ./test-build' ./test-build + echo '* Hit Ctrl-D to continue, or type '\''exit 1'\'' to abort' * Hit Ctrl-D to continue, or type 'exit 1' to abort + echo + /bin/sh --noprofile --norc /bin/sh: 0: Illegal option -- Fixes: 2b0c4fa13f3 Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/docker/run b/tests/docker/run index 1014871fec0..8edc7026ee3 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -62,7 +62,7 @@ echo "* Prepared to run command:" echo " $CMD" echo "* Hit Ctrl-D to continue, or type 'exit 1' to abort" echo -$SHELL --noprofile --norc +env bash --noprofile --norc if "$CMD"; then exit 0 @@ -72,7 +72,7 @@ elif test -n "$DEBUG"; then echo "* Hit Ctrl-D to exit" echo # Force error after shell exits - $SHELL --noprofile --norc && exit 1 + env bash --noprofile --norc && exit 1 else exit 1 fi