From 888309f420dd12df79a7c304f4e46737d46f7104 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 2 Jul 2018 15:34:53 +0200 Subject: [PATCH] Well... change FAKEROOT from /tmp to /home --- dev/tests/run_tests.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 1c0f910..eb9ddd5 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -41,7 +41,7 @@ LARGE_FILESET_URL="http://www.netpower.fr/sites/default/files/osync-test-files.tar.gz" # Fakeroot for install / uninstall and test of executables -FAKEROOT="/tmp/osync_test_install" +FAKEROOT="${HOME}/osync_test_install" OSYNC_DIR="$(pwd)" OSYNC_DIR=${OSYNC_DIR%%/dev*} @@ -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" $?