From 4814e7c9b2b9cc14d2890483747bcb1655579ec5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 9 Mar 2016 00:06:57 +0000
Subject: [PATCH] Specify synapse-directory for integ tests
---
jenkins-postgres.sh | 4 +++-
jenkins-sqlite.sh | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh
index 14e60482cd..876fabdc71 100755
--- a/jenkins-postgres.sh
+++ b/jenkins-postgres.sh
@@ -46,7 +46,9 @@ git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling b
./jenkins/prep_sytest_for_postgres.sh
echo >&2 "Running sytest with PostgreSQL";
-./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
+./jenkins/install_and_run.sh --python $TOX_BIN/python \
+ --synapse-directory $WORKSPACE \
+ --port-base $PORT_BASE
cd ..
cp sytest/.coverage.* .
diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh
index 9e474aa9f6..ff6664276d 100755
--- a/jenkins-sqlite.sh
+++ b/jenkins-sqlite.sh
@@ -40,7 +40,9 @@ cd sytest
git checkout "${GIT_BRANCH}" || (echo >&2 "No ref ${GIT_BRANCH} found, falling back to develop" ; git checkout develop)
: ${PORT_BASE:=8500}
-./jenkins/install_and_run.sh --python $TOX_BIN/python --port-base $PORT_BASE
+./jenkins/install_and_run.sh --python $TOX_BIN/python \
+ --synapse-directory $WORKSPACE \
+ --port-base $PORT_BASE
cd ..
cp sytest/.coverage.* .
--
GitLab