[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] cirrus-ci: fix bashism in the test_script code



commit bcb7f9588b75365b7ea59055fbe94b84638097a7
Author:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
AuthorDate: Tue Oct 7 09:00:55 2025 +0200
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Oct 7 15:13:16 2025 +0100

    cirrus-ci: fix bashism in the test_script code
    
    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>
    Release-Acked-By: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 10d8371ccc..30108892b7 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:
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.