From 93c60871502940a1c47ba31478252893a03fa1cb Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Mon, 15 Jan 2024 11:55:31 +0000 Subject: [PATCH 1/2] dump-ice-to-disk/check.sh: convert needless bashism in a /bin/sh script. --- tests/run-make/dump-ice-to-disk/check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run-make/dump-ice-to-disk/check.sh b/tests/run-make/dump-ice-to-disk/check.sh index ff6e4be35af9d..cf8bd0a4cf5ad 100644 --- a/tests/run-make/dump-ice-to-disk/check.sh +++ b/tests/run-make/dump-ice-to-disk/check.sh @@ -53,8 +53,8 @@ echo $should_be_empty_tmp if [ $short -eq $default_set ] && #[ $default -eq $short ] && [ $default_set -eq $full ] && - [[ $content == *"thread 'rustc' panicked at "* ]] && - [[ $content == *"stack backtrace:"* ]] && + [ "${content%%*"thread 'rustc' panicked at "*} != "$content" ] && + [ "${content%%*"stack backtrace:"*}" != "$content" ] && #[ $default -gt 0 ] && [ $should_be_empty_dot -eq 0 ] && [ $should_be_empty_tmp -eq 0 ]; then From eb5fb89565609b8a24ea775b45348a0009a02c7c Mon Sep 17 00:00:00 2001 From: Havard Eidnes Date: Mon, 15 Jan 2024 12:59:57 +0000 Subject: [PATCH 2/2] dump-ice-to-disk/check.sh: balance quoting. --- tests/run-make/dump-ice-to-disk/check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run-make/dump-ice-to-disk/check.sh b/tests/run-make/dump-ice-to-disk/check.sh index cf8bd0a4cf5ad..37aa7c66429c4 100644 --- a/tests/run-make/dump-ice-to-disk/check.sh +++ b/tests/run-make/dump-ice-to-disk/check.sh @@ -53,7 +53,7 @@ echo $should_be_empty_tmp if [ $short -eq $default_set ] && #[ $default -eq $short ] && [ $default_set -eq $full ] && - [ "${content%%*"thread 'rustc' panicked at "*} != "$content" ] && + [ "${content%%*"thread 'rustc' panicked at "*}" != "$content" ] && [ "${content%%*"stack backtrace:"*}" != "$content" ] && #[ $default -gt 0 ] && [ $should_be_empty_dot -eq 0 ] &&