From 60ecb6b4d4a8b5a8ed5ac918af7855f98e1570ac Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Wed, 17 Nov 2021 09:04:50 -0500
Subject: [PATCH] Fix running complement.sh script. (#11368)
By reverting changes from #11166 in this script. Specifically commit
13f084eb58c379b2fc073680818d5931e94626f4.
---
changelog.d/11368.misc | 1 +
scripts-dev/complement.sh | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/11368.misc
diff --git a/changelog.d/11368.misc b/changelog.d/11368.misc
new file mode 100644
index 0000000000..d623935865
--- /dev/null
+++ b/changelog.d/11368.misc
@@ -0,0 +1 @@
+Fix running `scripts-dev/complement.sh`, which was broken in v1.47.0rc1.
diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
index 7d38b39e90..89af7a4fde 100755
--- a/scripts-dev/complement.sh
+++ b/scripts-dev/complement.sh
@@ -24,7 +24,7 @@
set -e
# Change to the repository root
-cd "$(dirname "$0")/.."
+cd "$(dirname $0)/.."
# Check for a user-specified Complement checkout
if [[ -z "$COMPLEMENT_DIR" ]]; then
@@ -61,8 +61,8 @@ cd "$COMPLEMENT_DIR"
EXTRA_COMPLEMENT_ARGS=""
if [[ -n "$1" ]]; then
# A test name regex has been set, supply it to Complement
- EXTRA_COMPLEMENT_ARGS=(-run "$1")
+ EXTRA_COMPLEMENT_ARGS+="-run $1 "
fi
# Run the tests!
-go test -v -tags synapse_blacklist,msc2946,msc3083,msc2403,msc2716 -count=1 "${EXTRA_COMPLEMENT_ARGS[@]}" ./tests/...
+go test -v -tags synapse_blacklist,msc2946,msc3083,msc2403,msc2716 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests/...
--
GitLab