Let two more tests pass under MSYS2 (Windows)

- Updates the following tests:
  create-with-source-4, xport1
- Avoid Windows drive letter in the path of DEF:vname=rrdfile
  under MSYS or MSYS2. Use only the filename of the rrd and not
  the full path if environmental variable MSYSTEM is set.

diff --git a/tests/create-with-source-4 b/tests/create-with-source-4
index 2811374f3b7b47bc6ed61164724e4d001202aaa2..42c318b9014b84bfd172eaa617dc751a6ee29e1b 100755 (executable)
--- a/tests/create-with-source-4
+++ b/tests/create-with-source-4
@@ -3,7 +3,12 @@
 . $(dirname $0)/functions
 
 BASE=$BASEDIR/$(basename $0)-test
-PREFIX=$BUILDDIR/$(basename $0)-test
+if [ -n "$MSYSTEM" ]; then
+    # Avoid Windows drive letter issues in the path of DEF:vname=rrdfile under MSYS or MSYS2
+    PREFIX=$(basename $0)-test
+else
+    PREFIX=$BUILDDIR/$(basename $0)-test
+fi
 
 # currently, we do not properly copy cdp and pdp information, so for
 # comparison of RRD dumps, we just filter out those parts we do not

diff --git a/tests/xport1 b/tests/xport1
index 1154cd1007e156fc774e61a78d61316dab70632c..8d1addbf0bf2a3d84daf4f7461e56e0ddc17e9c1 100755 (executable)
--- a/tests/xport1
+++ b/tests/xport1
@@ -3,7 +3,12 @@
 . $(dirname $0)/functions
 
 BASE=$BASEDIR/xport1
-BUILD=$BUILDDIR/xport1
+if [ -n "$MSYSTEM" ]; then
+    # Avoid Windows drive letter issues in the path of DEF:vname=rrdfile under MSYS or MSYS2
+    BUILD=xport1
+else
+    BUILD=$BUILDDIR/xport1
+fi
 
 function do_update {
   $RRDTOOL update ${BUILD}.rrd 1300000001:54.540500:0.000002 1300000041:53.633500:1.494203 1300000081:53.513700:2.983955 1300000121:53.428200:4.470899 1300000161:53.359700:5.955546 1300000201:53.291300:7.438231 1300000241:53.222800:8.919214 1300000281:53.171500:10.398531 1300000321:53.120100:11.876360 1300000361:53.068800:13.352798 || return 1