WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Why do you do this travis ?

This commit is contained in:
deajan 2018-07-02 15:23:44 +02:00
parent e094e04038
commit 182e3921d5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/tests/run_tests.sh
View File

@ -306,10 +306,11 @@ function test_Merge () {
# Don't use SetConfFileValue here since for whatever reason Travis does not like creating a sed temporary file in $FAKEROOT
if [ "$TRAVIS_RUN" == true ]; then
$SUDO_CMD sed -i.tmp "s/IS_STABLE=*/IS_STABLE=yes/" "$OSYNC_EXECUTABLE"
$SUDO_CMD sed -i.tmp 's/IS_STABLE=*/IS_STABLE=yes/' "$OSYNC_EXECUTABLE"
else
sed -i.tmp "s/IS_STABLE=*/IS_STABLE=yes/" "$OSYNC_EXECUTABLE"
sed -i.tmp 's/IS_STABLE=*/IS_STABLE=yes/' "$OSYNC_EXECUTABLE"
fi
head $OSYNC_EXECUTABLE
#SetConfFileValue "$OSYNC_EXECUTABLE" "IS_STABLE" "yes"
@ -1100,7 +1101,7 @@ function test_ConflictDetetion () {
return 0
fi
for i in "${osyncParameters[0]}"; do
for i in "${osyncParameters[@]}"; do
cd "$OSYNC_DIR"
PrepareLocalDirs