Improve non-linux testing (#698)

dlang-community · Dec 8, 2022 · 0f68143 · 0f68143
1 parent e1977b4
commit 0f68143
Show file tree

Hide file tree

Showing 94 changed files with 171 additions and 170 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/tests/*/*.d           text eol=lf
diff --git 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/tc001/run.sh b/tests/tc001/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c12 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc002/run.sh b/tests/tc002/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c52 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc003/run.sh b/tests/tc003/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c696 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c713 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc004/run.sh b/tests/tc004/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c13 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc005/run.sh b/tests/tc005/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c136 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc006/run.sh b/tests/tc006/run.sh
@@ -2,13 +2,13 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c184 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c199 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c216 > actual3.txt
-diff actual3.txt expected3.txt
+diff actual3.txt expected3.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c231 > actual4.txt
-diff actual4.txt expected4.txt
+diff actual4.txt expected4.txt --strip-trailing-cr
diff --git a/tests/tc007/run.sh b/tests/tc007/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c97 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c130 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc008/run.sh b/tests/tc008/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c113 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc009/run.sh b/tests/tc009/run.sh
@@ -2,10 +2,10 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c83 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c93 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c148 > actual3.txt
-diff actual3.txt expected3.txt
+diff actual3.txt expected3.txt --strip-trailing-cr
diff --git 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
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 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 actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc011/run.sh b/tests/tc011/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c48 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc012/run.sh b/tests/tc012/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c35 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c61 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc013/run.sh b/tests/tc013/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c187 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c211 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git 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
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 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
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc015/run.sh b/tests/tc015/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file1.d -c84 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file2.d -c73 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc016/run.sh b/tests/tc016/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c24 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c57 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc017/run.sh b/tests/tc017/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c33 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc018/run.sh b/tests/tc018/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c61 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c88 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc019/run.sh b/tests/tc019/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c84 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c111 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc020/run.sh b/tests/tc020/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c159 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c199 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc021/run.sh b/tests/tc021/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c1 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc022/run.sh b/tests/tc022/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c16 > actual.txt
-diff actual.txt expected.txt
+diff actual.txt expected.txt --strip-trailing-cr
diff --git a/tests/tc023/run.sh b/tests/tc023/run.sh
@@ -2,7 +2,7 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c117 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c89 > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
diff --git a/tests/tc024/run.sh b/tests/tc024/run.sh
@@ -2,25 +2,25 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c286 -d > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c290 -d > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c294 -d > actual3.txt
-diff actual3.txt expected3.txt
+diff actual3.txt expected3.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c298 -d> actual4.txt
-diff actual4.txt expected4.txt
+diff actual4.txt expected4.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c302 -d> actual5.txt
-diff actual5.txt expected5.txt
+diff actual5.txt expected5.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c306 -d> actual6.txt
-diff actual6.txt expected6.txt
+diff actual6.txt expected6.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c313 -d> actual7.txt
-diff actual7.txt expected7.txt
+diff actual7.txt expected7.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c432 -d> actual8.txt
-diff actual8.txt expected8.txt
+diff actual8.txt expected8.txt --strip-trailing-cr
diff --git a/tests/tc025/run.sh b/tests/tc025/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c94 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc026/run.sh b/tests/tc026/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c53 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc027/run.sh b/tests/tc027/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c66 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc028/run.sh b/tests/tc028/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c122 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc029/run.sh b/tests/tc029/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c73 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc030/run.sh b/tests/tc030/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c11 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc031/run.sh b/tests/tc031/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -d -c1 > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc032/run.sh b/tests/tc032/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -l -c 15 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc033/run.sh b/tests/tc033/run.sh
@@ -2,8 +2,8 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -u -c22 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 # should work on last character of identifier
 ../../bin/dcd-client $1 file.d -u -c24 | sed s\""$(dirname "$(pwd)")"\"\" > actual2.txt
-diff actual2.txt expected1.txt
+diff actual2.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc034/run.sh b/tests/tc034/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -u -c1 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc035/run.sh b/tests/tc035/run.sh
@@ -2,4 +2,4 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -u -c8 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
diff --git a/tests/tc036/run.sh b/tests/tc036/run.sh
@@ -2,17 +2,17 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 file.d -c 15 | sed s\""$(dirname "$(pwd)")"\"\" > actual3.txt
-diff actual3.txt expected3.txt
+diff actual3.txt expected3.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 -I bar.d
 
 ../../bin/dcd-client $1 file.d -c 15 | sed s\""$(dirname "$(pwd)")"\"\" > actual1.txt
-diff actual1.txt expected1.txt
+diff actual1.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 file.d -c 40 | sed s\""$(dirname "$(pwd)")"\"\" > actual2.txt
-diff actual2.txt expected2.txt
+diff actual2.txt expected2.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 -R bar.d
 
 ../../bin/dcd-client $1 file.d -c 15 | sed s\""$(dirname "$(pwd)")"\"\" > actual3.txt
-diff actual3.txt expected3.txt
+diff actual3.txt expected3.txt --strip-trailing-cr
diff --git a/tests/tc038/run.sh b/tests/tc038/run.sh
@@ -2,10 +2,10 @@ set -e
 set -u
 
 ../../bin/dcd-client $1 implicit_array.d -c108 > actual.txt
-diff actual.txt expected1.txt
+diff actual.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 excplicit_array.d -c98 > actual.txt
-diff actual.txt expected1.txt
+diff actual.txt expected1.txt --strip-trailing-cr
 
 ../../bin/dcd-client $1 implicit_var.d -c108 > actual.txt
-diff actual.txt expected1.txt
+diff actual.txt expected1.txt --strip-trailing-cr