From 35904c82828ec1ba285385192f0578f6cd9f7792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20M=C3=BCller?= Date: Tue, 17 Oct 2017 19:42:51 +0200 Subject: [PATCH] In tests add dynamic-link to msys-2.0 for host-type msys To: address@hidden * test-suite/standalone/test-ffi (global): MSYS2 behaves like Cygwin. Therefore treat it alike by adding (dynamic-link "msys-2.0"). * test-suite/standalone/test-foreign-object-scm (global): MSYS2 behaves like Cygwin. Therefore treat it alike by adding (dynamic-link "msys-2.0"). --- test-suite/standalone/test-ffi | 3 +++ test-suite/standalone/test-foreign-object-scm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/test-suite/standalone/test-ffi b/test-suite/standalone/test-ffi index 0e6ab45d1..eb0a0d28f 100755 --- a/test-suite/standalone/test-ffi +++ b/test-suite/standalone/test-ffi @@ -269,6 +269,9 @@ exec guile -q -s "$0" "$@" ;; into linked DLLs. Thus one needs to link to the core ;; C library DLL explicitly. (dynamic-link "cygwin1")) + ((string-contains %host-type "msys") + ;; MSYS2 behaves like Cygwin + (dynamic-link "msys-2.0")) (else (dynamic-link)))) diff --git a/test-suite/standalone/test-foreign-object-scm b/test-suite/standalone/test-foreign-object-scm index fd4669aa9..0c4114d2a 100755 --- a/test-suite/standalone/test-foreign-object-scm +++ b/test-suite/standalone/test-foreign-object-scm @@ -35,6 +35,9 @@ exec guile -q -s "$0" "$@" ;; needs to link to the core C library DLL ;; explicitly. (dynamic-link "cygwin1")) + ((string-contains %host-type "msys") + ;; MSYS2 behaves like Cygwin + (dynamic-link "msys-2.0")) (else (dynamic-link))))) (lambda (k . args) -- 2.14.2