From a3c5df9a858c3fb0a502aa10a324926f0814c787 Mon Sep 17 00:00:00 2001 From: deajan Date: Mon, 21 Nov 2016 18:38:43 +0100 Subject: [PATCH] Feeling stupid for this basic error --- dev/tests/run_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 05dfa12..2fcde48 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -511,7 +511,7 @@ function test_softdeletion_cleanup () { touch "$file.new" - if [ "$TRAVIS_RUN" != true ] || [ "$LOCAL_OS" != "BSD" ] || [ "$LOCAL_OS" != "MacOSX" ]; then + if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then CreateOldFile "$file.old" else echo "Skipping changing ctime on file because travis / bsd / macos does not support debugfs" @@ -526,7 +526,7 @@ function test_softdeletion_cleanup () { [ -f "$file.new" ] assertEquals "New softdeleted / backed up file [$file.new] exists." "0" $? - if [ "$TRAVIS_RUN" != true ] || [ "$LOCAL_OS" != "BSD" ] || [ "$LOCAL_OS" != "MacOSX" ]; then + if [ "$TRAVIS_RUN" != true ] && [ "$LOCAL_OS" != "BSD" ] && [ "$LOCAL_OS" != "MacOSX" ]; then [ ! -f "$file.old" ] assertEquals "Old softdeleted / backed up file [$file.old] is deleted permanently." "1" $? else