[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-4.21 v2 2/3] cirrus-ci: fix bashism in the test_script code
- To: xen-devel@xxxxxxxxxxxxxxxxxxxx
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Tue, 7 Oct 2025 09:00:55 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5rt/WxD6Gdd7rLdutxff+o1yeRD3SJzgEDdXFlgHJEU=; b=gId9IfyTmPfUboDkC8zHdvesSopOqztdU3wEMH5WO6szdav0kQmlJOMuLFMKeVoGhVnVc5Teu0RxCiD8EoF6yoW4e+Hx3Wv07eJyptcB2TbJHCPxZYunGjHg9bsLykIbZXqMUoiqP9L0jCYE2AYpIm0gh4IcEai8j8GtIxJBIpbuPzfC0wHmzM41GHzYFHTlw70ZiA3psKJBwoixm4TH9QL3nSgEZoWt+hLrw0R6rswuppHMC0dcoQ1FahkHb17G46z3ix4eS09iT/ykBvA5B5r67v6qfA+Y0tObt1ins+dCB6Vw6hQRN2e+4JKRqwEzk7BW8E01IIS0DvJKaM1ZkQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JnB3cpuaLGAZO40oiAGqjyyOFML6BWr3tkG71M3byMRDKeumaPF8pwkIxdSm6AcOPmgDeN+J/16SI30nlmhhg2+JZh8xcPga0C3/9iMzvmQN+Vw3QpNxm76G9marBbieIIPhiGmTUJ11vkMyCQMxmEIBUD1POjwoGmkf3Lj+E7VDvLiK+TCg0n8uiFtLj/2dc9npaHocpkCV3o1BnQB8GgKGVVdQpBW+sauRoincSkhLuV6BDmsZ8LCjaYYN7teVDPlRnVbVxBSkFs3eYscVUDRcTueZefLQLrpQqj3Nau/FfGhQ57fa1wmdUURh3Q1DQfMRvmAnRuR0tk4V22ArfQ==
- Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
- Cc: oleksii.kurochko@xxxxxxxxx, Roger Pau Monne <roger.pau@xxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
- Delivery-date: Tue, 07 Oct 2025 07:01:41 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
The default shell in FreeBSD is plain sh, which doesn't support the usage
of the '|&' operator:
./automation/scripts/console.exp |& sed 's/\r\+$//'
/tmp/scripts34c427adc6599db29cb91221a0939d85.sh: 16: Syntax error: "&"
unexpected
Fix this by using a redirection of stderr into stdout, and then a pipe.
Fixes: a406195c15dd ("automation: call expect script with redirected standard
error")
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
.cirrus.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 10d8371ccc38..30108892b751 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -167,7 +167,7 @@ task:
export TEST_LOG="serial-${FREEBSD_BUILD}-${XTF_ARCH}.txt"
export PASSED="Test result: SUCCESS"
export TEST_TIMEOUT=120
- ./automation/scripts/console.exp |& sed 's/\r\+$//'
+ ./automation/scripts/console.exp 2>&1 | sed 's/\r\+$//'
always:
serial_artifacts:
--
2.51.0
|
