From bd6b377498a40699c498b20a0f953b8aaf0b636e Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 8 Dec 2022 01:47:44 +0100 Subject: [PATCH] Dropped the trailing 's' for sleep to make it work on MacOS too --- tests/run_tests.sh | 6 +++--- tests/tc010/run.sh | 4 ++-- tests/tc014/run.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/run_tests.sh b/tests/run_tests.sh index f26f78c..59cca6b 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -23,7 +23,7 @@ function startServer() { "$server" "$tcp" --ignoreConfig -I $IMPORTS 2>stderr.txt > stdout.txt & server_pid=$! - sleep 1s; + sleep 1 } # Make sure that the server is shut down @@ -33,7 +33,7 @@ echo "Shutting down currently-running server..." for socket in unix tcp; do # allow some time for server to shutdown - sleep 0.5s; + sleep 0.5; if [[ $socket == "tcp" ]]; then tcp="--tcp" @@ -54,7 +54,7 @@ for socket in unix tcp; do fi sleepTime=$((1 << $i)) echo "Server isn't up yet. Sleeping for ${sleepTime}s" - sleep "${sleepTime}s" + sleep "${sleepTime}" done # Run tests diff --git a/tests/tc010/run.sh b/tests/tc010/run.sh index a9cfee0..a9f1b8d 100755 --- a/tests/tc010/run.sh +++ b/tests/tc010/run.sh @@ -4,14 +4,14 @@ set -u cp testfile1_old.d ../imports/testfile1.d # Sleep because modification times aren't stored with granularity of less # than one second -sleep 1s; +sleep 1 ../../bin/dcd-client $1 file.d -c84 > actual1.txt diff actual1.txt expected1.txt cp testfile1_new.d ../imports/testfile1.d # Same here -sleep 1s; +sleep 1 ../../bin/dcd-client $1 file.d -c84 > actual2.txt diff actual2.txt expected2.txt diff --git a/tests/tc014/run.sh b/tests/tc014/run.sh index 7883039..5c48896 100755 --- a/tests/tc014/run.sh +++ b/tests/tc014/run.sh @@ -4,14 +4,14 @@ set -u cp testfile2_old.d ../imports/testfile2.d # Sleep because modification times aren't stored with granularity of less # than one second -sleep 1s; +sleep 1 ../../bin/dcd-client $1 file.d -c39 > actual1.txt diff actual1.txt expected1.txt cp testfile2_new.d ../imports/testfile2.d # Same here -sleep 1s; +sleep 1 ../../bin/dcd-client $1 file.d -c39 > actual2.txt diff actual2.txt expected2.txt