From edfc292486126d793cbd40f399a4cb3fcdcf45cd Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Wed, 14 Jun 2023 11:25:12 +0200 Subject: [PATCH] Temporarily disable merge test --- dev/tests/run_tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 89db1b5..6a21830 100755 --- 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 {} \+