From 097403a8addca6553355484836c4aa7941c8f1c6 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <mail@joachim-bauch.de>
Date: Tue, 20 Sep 2016 00:14:56 +0200
Subject: [PATCH] Added wrapper to run wine/wine64.

---
 tests/Makefile    |  2 +-
 tests/runtests.sh | 10 +---------
 tests/runwine.sh  | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100755 tests/runwine.sh

diff --git a/tests/Makefile b/tests/Makefile
index 9df5da5..626611f 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -85,5 +85,5 @@ clean:
 	$(RM) -rf LoadDll.exe $(TEST_DLLS) $(LOADDLL_OBJ) $(DLL_OBJ)
 
 test: all
-	./TestSuite.exe
+	./runwine.sh $(PLATFORM) TestSuite.exe
 	./runtests.sh $(PLATFORM) "$(TEST_DLLS)"
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 57d70c6..a2c6520 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 PLATFORM=$1
-if [ "${PLATFORM}" = "x86_64" ]; then
-    export WINEPREFIX=${HOME}/.wine64/
-    WINE=wine64
-else
-    export WINEPREFIX=${HOME}/.wine/
-    WINE=wine
-fi
-export WINEPATH=/usr/lib/gcc/${PLATFORM}-w64-mingw32/4.6/
 
 read -a TEST_DLLS <<< $2
 
@@ -15,7 +7,7 @@ for filename in "${TEST_DLLS[@]}"
 do
     :
     echo "Testing $filename"
-    ${WINE} ./LoadDll.exe $filename
+    ./runwine.sh "${PLATFORM}" ./LoadDll.exe $filename
     if [ "$?" != "0" ]; then
         exit 1
     fi
diff --git a/tests/runwine.sh b/tests/runwine.sh
new file mode 100755
index 0000000..eaee1fc
--- /dev/null
+++ b/tests/runwine.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -eu
+PLATFORM=$1
+shift
+
+if [ "${PLATFORM}" = "x86_64" ]; then
+    export WINEPREFIX=${HOME}/.wine64/
+    WINE=wine64
+else
+    export WINEPREFIX=${HOME}/.wine/
+    WINE=wine
+fi
+export WINEPATH=/usr/lib/gcc/${PLATFORM}-w64-mingw32/4.6/
+
+exec ${WINE} $@