Temporarily disable merge test

11 months ago · edfc292486
parent 9ade468ed8
commit edfc292486
1 changed files with 3 additions and 3 deletions
--- a/dev/tests/run_tests.sh
+++ b/dev/tests/run_tests.sh
@ -200,9 +200,9 @@ function PrepareLocalDirs () {
 function oneTimeSetUp () {
 	START_TIME=$SECONDS

-	echo "Running forced merge"
-	cd "${DEV_DIR}"
-	$SUDO_CMD ./merge.sh osync
+	#echo "Running forced merge"
+	#cd "${DEV_DIR}"
+	#$SUDO_CMD ./merge.sh osync
 	echo "Setting security for files"
 	$SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+