aboutsummaryrefslogtreecommitdiff
path: root/autotests
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-05-29 23:01:09 +0200
committerAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-05-30 08:49:38 +0200
commit8a868988be0c5ce4ea8a22f4a6f8c7e8b2e42037 (patch)
tree6818e058f999d02b00fa1ece3591980579cec908 /autotests
parent01d0e0b68079e9b82f3d2640613b3f45b95dc71e (diff)
downloadlibquotient-8a868988be0c5ce4ea8a22f4a6f8c7e8b2e42037.tar.gz
libquotient-8a868988be0c5ce4ea8a22f4a6f8c7e8b2e42037.zip
run-tests.sh: fix weird CI failure on Linux/Clang
Also fix a leftover data/ prefix in adjust-config.sh
Diffstat (limited to 'autotests')
-rw-r--r--autotests/adjust-config.sh2
-rwxr-xr-xautotests/run-tests.sh4
2 files changed, 2 insertions, 4 deletions
diff --git a/autotests/adjust-config.sh b/autotests/adjust-config.sh
index a55ac670..68ea58ab 100644
--- a/autotests/adjust-config.sh
+++ b/autotests/adjust-config.sh
@@ -36,7 +36,7 @@ rc_joins:
per_second: 10000
burst_count: 100000
HEREDOC
-) | $CMD tee -a data/homeserver.yaml
+) | $CMD tee -a homeserver.yaml
$CMD perl -pi -w -e \
's/^#enable_registration: false/enable_registration: true/g;' homeserver.yaml
diff --git a/autotests/run-tests.sh b/autotests/run-tests.sh
index a3ee2ade..05a215af 100755
--- a/autotests/run-tests.sh
+++ b/autotests/run-tests.sh
@@ -4,9 +4,7 @@ chmod 0777 data
rm ~/.local/share/testolmaccount -rf
docker run -v `pwd`/data:/data --rm \
-e SYNAPSE_SERVER_NAME=localhost -e SYNAPSE_REPORT_STATS=no matrixdotorg/synapse:latest generate
-pushd data
-. ../autotests/adjust-config.sh
-popd
+(cd data && . ../autotests/adjust-config.sh)
docker run -d \
--name synapse \
-p 1234:8008 \