Archives
/
osync
mirror of https://github.com/deajan/osync
2
0
Fork 0
Code Issues Releases Wiki Activity

Temporarily disable merge test

Browse Source
stable
Orsiris de Jong 11 months ago
parent 9ade468ed8
commit edfc292486
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
dev/tests/run_tests.sh
Unescape Escape View File

@ -200,9 +200,9 @@ function PrepareLocalDirs () {
function oneTimeSetUp () { function oneTimeSetUp () {
START_TIME=$SECONDS START_TIME=$SECONDS
echo "Running forced merge" #echo "Running forced merge"
cd "${DEV_DIR}" #cd "${DEV_DIR}"
$SUDO_CMD ./merge.sh osync #$SUDO_CMD ./merge.sh osync
echo "Setting security for files" echo "Setting security for files"
$SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+ $SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+

Write Preview
Loading…
Cancel
Save