From d655f942b11bb4faab4e0fd596ce319785d646cb Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 5 Dec 2016 11:23:48 +0100 Subject: [PATCH] Removed some tests from travis because of time limit --- dev/tests/run_tests.sh | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index b5e1e43..25649b0 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -7,7 +7,7 @@ ## On CYGWIN / MSYS, ACL and extended attributes aren't supported -# osync test suite 2016120401 +# osync test suite 2016120501 # 4 tests: # quicklocal @@ -178,7 +178,7 @@ function PrepareLocalDirs () { rm -rf "$INITIATOR_DIR" fi mkdir -p "$INITIATOR_DIR" - + if [ -d "$TARGET_DIR" ]; then rm -rf "$TARGET_DIR" fi @@ -448,7 +448,12 @@ function test_skip_deletion () { return 0 fi - modes=('initiator' 'target' 'initiator,target') + # TRAVIS SPECIFIC - time limitation + if [ "$TRAVIS_RUN" != true ]; then + modes=('initiator' 'target' 'initiator,target') + else + modes=('target') + fi for mode in "${modes[@]}"; do @@ -518,7 +523,7 @@ function test_handle_symlinks () { fi # Check with and without copySymlinks - copySymlinks="yes" + copySymlinks="no" echo "Running with COPY_SYMLINKS=$copySymlinks" @@ -599,8 +604,13 @@ function test_handle_symlinks () { assertEquals "File [$INITIATOR_DIR/$OSYNC_DELETE_DIR/$FileBL] is not present in deletion dir." "0" $? done + # TRAVIS SPECIFIC - time limitation + if [ "$TRAVIS_RUN" != true ]; then + return 0 + fi + # Check with and without copySymlinks - copySymlinks="no" + copySymlinks="yes" echo "Running with COPY_SYMLINKS=$copySymlinks"