Added wrapper to run wine/wine64.

fancycode · fancycode · commit 097403a8addc · 2016-09-20T00:23:29.000+02:00
diff --git 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
@@ -1,21 +1,13 @@
 #!/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
 
 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
@@ -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} $@
