From cf0152b170f692b5326a16bc5b776aba308b7af8 Mon Sep 17 00:00:00 2001 From: Bruce Collie Date: Tue, 2 Jul 2024 21:42:54 +0100 Subject: [PATCH] Use portable sed invocation (#4494) The `\|` operator is not portable to BSD / macOS sed, which makes some tests appear flaky when run on those platforms. This PR switches the offending command over to a wordier, but correct invocation. --- k-distribution/include/kframework/ktest-common.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k-distribution/include/kframework/ktest-common.mak b/k-distribution/include/kframework/ktest-common.mak index e87717e9d68..ce1a6102c5a 100644 --- a/k-distribution/include/kframework/ktest-common.mak +++ b/k-distribution/include/kframework/ktest-common.mak @@ -28,4 +28,4 @@ LLVM_KRUN=${K_BIN}/llvm-krun # and kdep KDEP=${K_BIN}/kdep # command to strip paths from test outputs -REMOVE_PATHS=| sed 's!\('`pwd`'\|'${BUILTIN_DIR}'\|/nix/store/.\+/include/kframework/builtin\)/\(\./\)\{0,2\}!!g' +REMOVE_PATHS=| sed 's!\('`pwd`'\)/\(\./\)\{0,2\}!!g' | sed 's!\('${BUILTIN_DIR}'\)/\(\./\)\{0,2\}!!g' | sed 's!\('/nix/store/..*/include/kframework/builtin'\)/\(\./\)\{0,2\}!!g'