From 5438941c88d263420baf0535e83d9ae4e916195e Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 2 Jul 2018 15:37:35 +0200 Subject: [PATCH] Help..travis is killing me --- dev/tests/run_tests.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index eb9ddd5..ef17afe 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -305,13 +305,13 @@ function test_Merge () { # Set osync version to stable while testing to avoid warning message # 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" - #else - # sed -i.tmp 's/^IS_STABLE=.*/IS_STABLE=yes/' "$OSYNC_EXECUTABLE" - #fi - #head -n 20 $OSYNC_EXECUTABLE - SetConfFileValue "$OSYNC_EXECUTABLE" "IS_STABLE" "yes" + if [ "$TRAVIS_RUN" == true ]; then + $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" + fi + head -n 20 $OSYNC_EXECUTABLE + #SetConfFileValue "$OSYNC_EXECUTABLE" "IS_STABLE" "yes" assertEquals "Install failed" "0" $?