From 4a29726f76ecc8375b06b64a5c53de1f4d50af26 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Tue, 11 Feb 2020 01:47:57 +0100
Subject: [PATCH] Adjusted solc path and fixed remapping tests in
 cmdlineTests.sh under mingw64.

---
 test/cmdlineTests.sh | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 754cd0bac..fd0375407 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -33,7 +33,19 @@ set -e
 REPO_ROOT=$(cd $(dirname "$0")/.. && pwd)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-build}
 source "${REPO_ROOT}/scripts/common.sh"
-SOLC="$REPO_ROOT/${SOLIDITY_BUILD_DIR}/solc/solc"
+
+case "$OSTYPE" in
+    msys)
+        SOLC="$REPO_ROOT/${SOLIDITY_BUILD_DIR}/solc/Release/solc.exe"
+
+        # prevents msys2 path translation for a remapping test
+        export MSYS2_ARG_CONV_EXCL="="
+        ;;
+    *)
+        SOLC="$REPO_ROOT/${SOLIDITY_BUILD_DIR}/solc/solc"
+        ;;
+esac
+
 INTERACTIVE=true
 if ! tty -s || [ "$CI" ]
 then