From 99bc332a8190c9e65740adf86bfa622d5422ea38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Fri, 17 Feb 2017 00:49:40 +0100 Subject: [PATCH] Allow script based tests and fix test package recipes. --- tests/std.concurrency.d | 2 +- tests/vibe.core.file.d | 2 +- tests/vibe.core.net.1429.d | 2 +- tests/vibe.core.net.1441.d | 2 +- tests/vibe.core.net.1452.d | 3 ++- travis-ci.sh | 10 ++++++++-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/std.concurrency.d b/tests/std.concurrency.d index f7733e5..b7a7a55 100644 --- a/tests/std.concurrency.d +++ b/tests/std.concurrency.d @@ -1,4 +1,4 @@ -/++ dub.sdl: +/+ dub.sdl: name "test" description "Tests vibe.d's std.concurrency integration" dependency "vibe-core" path="../" diff --git a/tests/vibe.core.file.d b/tests/vibe.core.file.d index 44f8457..254b684 100644 --- a/tests/vibe.core.file.d +++ b/tests/vibe.core.file.d @@ -1,4 +1,4 @@ -/++ dub.sdl: +/+ dub.sdl: name "test" dependency "vibe-core" path=".." +/ diff --git a/tests/vibe.core.net.1429.d b/tests/vibe.core.net.1429.d index a81e9f0..81be91f 100644 --- a/tests/vibe.core.net.1429.d +++ b/tests/vibe.core.net.1429.d @@ -1,4 +1,4 @@ -/++ dub.sdl: +/+ dub.sdl: name "test" description "TCP disconnect task issue" dependency "vibe-core" path="../" diff --git a/tests/vibe.core.net.1441.d b/tests/vibe.core.net.1441.d index b5c3d6b..460e4fa 100644 --- a/tests/vibe.core.net.1441.d +++ b/tests/vibe.core.net.1441.d @@ -1,4 +1,4 @@ -/++ dub.sdl: +/+ dub.sdl: name "test" description "TCP disconnect task issue" dependency "vibe-core" path="../" diff --git a/tests/vibe.core.net.1452.d b/tests/vibe.core.net.1452.d index 1a6023c..0ad83bb 100644 --- a/tests/vibe.core.net.1452.d +++ b/tests/vibe.core.net.1452.d @@ -1,7 +1,8 @@ -/++ dub.sdl: +/+ dub.sdl: name "test" description "Invalid memory operation on TCP connection leakage at shutdown" dependency "vibe-core" path="../" +debugVersions "VibeAsyncLog" +/ module test; diff --git a/travis-ci.sh b/travis-ci.sh index d816449..2c8df94 100755 --- a/travis-ci.sh +++ b/travis-ci.sh @@ -21,7 +21,13 @@ if [ ${BUILD_EXAMPLE=1} -eq 1 ]; then fi if [ ${RUN_TEST=1} -eq 1 ]; then for ex in `\ls -1 tests/*.d`; do - echo "[INFO] Running test $ex" - dub --temp-build --compiler=$DC --single $ex # --override-config vibe-core/$CONFIG + script="${ex:0:-2}.sh" + if [ -e "$script" ]; then + echo "[INFO] Running test scipt $script" + (cd tests && "./${script:6}") + else + echo "[INFO] Running test $ex" + dub --temp-build --compiler=$DC --single $ex # --override-config vibe-core/$CONFIG + fi done fi