Add preflight merge

11 months ago · d9e22b06e5
parent d0af0804a0
commit d9e22b06e5
1 changed files with 4 additions and 0 deletions
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@ -200,6 +200,10 @@ function PrepareLocalDirs () {
 function oneTimeSetUp () {
 	START_TIME=$SECONDS

+	echo "Running forced merge"
+	cd "${DEV_DIR}"
+	./merge.sh osync
+
 	echo "Running install.sh from ${OSYNC_DIR}"
 	ls -alh ${OSYNC_DIR}
 	$SUDO_CMD ${OSYNC_DIR}/install.sh --prefix="${FAKEROOT}"