From: Magnus Jacobsson Date: Fri, 7 Jan 2022 13:03:00 +0000 (+0100) Subject: gvpr: correct fix for absolute paths to work also on MinGW X-Git-Tag: 3.0.0~82^2~11 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26f56f267cb4969c692ee54b7a7bc11cbe0124eb;p=graphviz gvpr: correct fix for absolute paths to work also on MinGW Fixes https://gitlab.com/graphviz/graphviz/-/issues/1780 on MinGW. Without this fix, test_1780 fails: __________________________________ test_1780 __________________________________ Traceback (most recent call last): File "C:/Users/magja/graphviz2/rtest/test_regression.py", line 594, in test_1780 subprocess.check_call(["gvpr", "-f", clustg], stdin=subprocess.DEVNULL) File "C:/tools/msys64/mingw64/lib/python3.9/subprocess.py", line 373, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['gvpr', '-f', WindowsPath('C:/Users/magja/graphviz2/cmd/gvpr/lib/clustg')]' returned non-zero exit status 4294967295. ---------------------------- Captured stderr call ----------------------------- gvpr: gvpr Usage: gvpr gvpr --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b2854784..c80662d1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - mismatched format string in `mingle` - Building from scratch with Visual Studio fails #2175 - Plugins are not configured on MinGW #2176 +- gvpr on MinGW does not support absolute paths #1780 ## [2.50.0] – 2021-12-04 diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c index 4a5379235..d9d4f7c1f 100644 --- a/lib/gvpr/gvpr.c +++ b/lib/gvpr/gvpr.c @@ -177,7 +177,7 @@ static int parseArgs(char *s, int argc, char ***argv) } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW32__) #define PATHSEP '\\' #define LISTSEP ';' #else