From e02aaa717c984b706464727100ed62a9ee98a06a Mon Sep 17 00:00:00 2001 From: jschaul Date: Thu, 12 May 2022 19:51:29 +0200 Subject: [PATCH 1/3] show package name for which tests run --- hack/bin/cabal-run-all-tests.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hack/bin/cabal-run-all-tests.sh b/hack/bin/cabal-run-all-tests.sh index 7d84637417..8004f7b217 100755 --- a/hack/bin/cabal-run-all-tests.sh +++ b/hack/bin/cabal-run-all-tests.sh @@ -2,11 +2,16 @@ set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" TOP_LEVEL="$(cd "$DIR/../.." && pwd)" -find "$TOP_LEVEL" -name '*.cabal' | +packages=$(find "$TOP_LEVEL" -name '*.cabal' | grep -v dist-newstyle | xargs -n 1 dirname | xargs -n 1 basename | - xargs -n 1 "$DIR/cabal-run-tests.sh" + xargs -n 1 echo) + +for p in $packages; do + echo "==== Testing $p..." + "$DIR/cabal-run-tests.sh" "$p" +done From 84ca9a04cfdb554c5c77e3cc637c2194f8d95644 Mon Sep 17 00:00:00 2001 From: jschaul Date: Tue, 24 May 2022 01:15:31 +0200 Subject: [PATCH 2/3] remove echo --- hack/bin/cabal-run-all-tests.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hack/bin/cabal-run-all-tests.sh b/hack/bin/cabal-run-all-tests.sh index 8004f7b217..cc167f6652 100755 --- a/hack/bin/cabal-run-all-tests.sh +++ b/hack/bin/cabal-run-all-tests.sh @@ -8,8 +8,7 @@ TOP_LEVEL="$(cd "$DIR/../.." && pwd)" packages=$(find "$TOP_LEVEL" -name '*.cabal' | grep -v dist-newstyle | xargs -n 1 dirname | - xargs -n 1 basename | - xargs -n 1 echo) + xargs -n 1 basename) for p in $packages; do echo "==== Testing $p..." From 5e3333eb5fed5c05494f492d660215c2be3dc1f4 Mon Sep 17 00:00:00 2001 From: jschaul Date: Tue, 24 May 2022 01:21:26 +0200 Subject: [PATCH 3/3] guard against imaginary case and make the bash code a little more unreadable upon request --- hack/bin/cabal-run-all-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/bin/cabal-run-all-tests.sh b/hack/bin/cabal-run-all-tests.sh index cc167f6652..2101f2477b 100755 --- a/hack/bin/cabal-run-all-tests.sh +++ b/hack/bin/cabal-run-all-tests.sh @@ -5,12 +5,12 @@ set -euo pipefail DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" TOP_LEVEL="$(cd "$DIR/../.." && pwd)" -packages=$(find "$TOP_LEVEL" -name '*.cabal' | +mapfile -t packages < <(find "$TOP_LEVEL" -name '*.cabal' | grep -v dist-newstyle | xargs -n 1 dirname | xargs -n 1 basename) -for p in $packages; do +for p in "${packages[@]}"; do echo "==== Testing $p..." "$DIR/cabal-run-tests.sh" "$p" done