From c6b809ef1d6600b22b44a263125a032355e21dad Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 7 May 2020 15:46:53 +0100 Subject: [PATCH 1/2] Dendrite: Show sytest compliance report after sytest runs --- scripts/dendrite_sytest.sh | 3 +++ scripts/prep_sytest_for_sqlite.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100755 scripts/prep_sytest_for_sqlite.sh diff --git a/scripts/dendrite_sytest.sh b/scripts/dendrite_sytest.sh index ae17d621f..e3c72ae18 100755 --- a/scripts/dendrite_sytest.sh +++ b/scripts/dendrite_sytest.sh @@ -71,4 +71,7 @@ if [ $TEST_STATUS -ne 0 ]; then cat /work/show_expected_fail_tests_output.txt >> /logs/annotate.md fi +echo >&2 "--- Sytest compliance report" +(cd /src && ./are-we-synapse-yet.py /logs/results.tap) || true + exit $TEST_STATUS diff --git a/scripts/prep_sytest_for_sqlite.sh b/scripts/prep_sytest_for_sqlite.sh new file mode 100755 index 000000000..bba01e54b --- /dev/null +++ b/scripts/prep_sytest_for_sqlite.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Configure sytest to use postgres databases, per the env vars. This is used +# by both the sytest builds and the synapse ones. +# + +set -e + +cd "/work" + +export SQLITE_DB_1=sqlite1 +export SQLITE_DB_2=sqlite2 + +mkdir -p "server-0" +mkdir -p "server-1" + +# Write out the configuration for a PostgreSQL Dendrite +# Note: Dendrite can run entirely within a single database as all of the tables have +# component prefixes +cat > "server-0/database.yaml" << EOF +name: sqlite3 +args: + database: $SQLITE_DB_1 +EOF + +cat > "server-1/database.yaml" << EOF +name: sqlite3 +args: + database: $SQLITE_DB_2 +EOF From 572bd63e6f1b7551d7f3c0be8541f2db32586c03 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 7 May 2020 15:49:28 +0100 Subject: [PATCH 2/2] Remove prep_sytest_for_sqlite --- scripts/prep_sytest_for_sqlite.sh | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100755 scripts/prep_sytest_for_sqlite.sh diff --git a/scripts/prep_sytest_for_sqlite.sh b/scripts/prep_sytest_for_sqlite.sh deleted file mode 100755 index bba01e54b..000000000 --- a/scripts/prep_sytest_for_sqlite.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Configure sytest to use postgres databases, per the env vars. This is used -# by both the sytest builds and the synapse ones. -# - -set -e - -cd "/work" - -export SQLITE_DB_1=sqlite1 -export SQLITE_DB_2=sqlite2 - -mkdir -p "server-0" -mkdir -p "server-1" - -# Write out the configuration for a PostgreSQL Dendrite -# Note: Dendrite can run entirely within a single database as all of the tables have -# component prefixes -cat > "server-0/database.yaml" << EOF -name: sqlite3 -args: - database: $SQLITE_DB_1 -EOF - -cat > "server-1/database.yaml" << EOF -name: sqlite3 -args: - database: $SQLITE_DB_2 -EOF