From 063c812e5e507ac65e626c56e4333d5bc91f57d5 Mon Sep 17 00:00:00 2001
From: verhoek <30193551+verhoek@users.noreply.github.com>
Date: Tue, 3 Dec 2019 21:15:25 +0100
Subject: Version bump test + sanity check

Forgot a version bump and added sanity check of source/target dirs.
---
 pipeline/docker-run/docker-run  | 6 ++++++
 pipeline/stage_unittests/job.sh | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'pipeline')

diff --git a/pipeline/docker-run/docker-run b/pipeline/docker-run/docker-run
index 8e1cf78a9..aa3625825 100755
--- a/pipeline/docker-run/docker-run
+++ b/pipeline/docker-run/docker-run
@@ -82,6 +82,12 @@ function parse_options () {
       fi
   done
 
+
+  if [ "${TARGET_DIR##${SOURCE_DIR}}" != "${TARGET_DIR}" ]; then
+    echo "targetdir $TARGET_DIR is not allowed to be a subdir of sourcedir $SOURCE_DIR"
+  fi
+
+
   add_option "--workingdir" "$TARGET_DIR"
   add_option "--sourcedirnum" ${#SOURCE_DIR[@]}
 }
diff --git a/pipeline/stage_unittests/job.sh b/pipeline/stage_unittests/job.sh
index e2d1fd637..d31ac509b 100755
--- a/pipeline/stage_unittests/job.sh
+++ b/pipeline/stage_unittests/job.sh
@@ -25,7 +25,7 @@ function start_test () {
         fi
 
         travis_mark_begin "UNIT TESTING CATEGORY $CAT"
-        mono "${DUPLICATI_ROOT}"/testrunner/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe \
+        mono "${DUPLICATI_ROOT}"/testrunner/NUnit.ConsoleRunner.3.10.0/tools/nunit3-console.exe \
         "${DUPLICATI_ROOT}"/Duplicati/UnitTest/bin/Release/Duplicati.UnitTest.dll --where:cat==$CAT --workers=1
         travis_mark_end "UNIT TESTING CATEGORY $CAT"
     done
-- 
cgit v1.2.3