From 847d679b86b55baca0ce116077b9b8ed8c8886aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wolfgang=20St=C3=B6ggl?= Date: Sat, 23 Mar 2019 15:12:16 +0100 Subject: [PATCH] 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. --- tests/create-with-source-4 | 7 ++++++- tests/xport1 | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/create-with-source-4 b/tests/create-with-source-4 index 2811374f..42c318b9 100755 --- 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 1154cd10..8d1addbf 100755 --- 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 -- 2.47.2