Set WINEPATH for tests, and remove symlink workaround.

ChangeLog

 2020-04-23  Niels Möller  <nisse@lysator.liu.se>
 
+	* run-tests: Set WINEPATH, since it appears wine doesn't search
+	for dlls in the unix PATH.
+	* examples/setup-env: Delete creation of extra dll symlinks.
+	* examples/teardown-env: Delete corresponding cleanup.
+	* testsuite/setup-env: Deleted file (same symlink creation).
+	* testsuite/teardown-env: Delete corresponding cleanup.
+
 	* testsuite/ecc-add-test.c (test_main): Delete ASSERTs with
 	functions pointer comparisons. They provide little value, and fail
 	when linking with hogweed.dll on windows.

examples/setup-env

@@ -2,15 +2,6 @@
 
 set -e
 
-# Workaround, it seems difficult to convince wine to put ../lib into PATH.
-case "$EMULATOR" in
-    wine*)
-	for f in ../.lib/*.dll ; do
-	  ln -sf "$f" .
-	done
-	;;
-esac
-
 if [ -x rsa-keygen$EXEEXT ] ; then
   $EMULATOR ./rsa-keygen -r rsa-decrypt$EXEEXT -o testkey || exit 1
 fi

examples/teardown-env

@@ -3,9 +3,3 @@
 rm -rf testkey testkey.pub testsignature testsignature2 \
     testdata testtmp \
     testciphertext testcleartext
-
-case "$EMULATOR" in
-    wine*)
-	find . -type l -name '*.dll' -exec rm -f '{}' ';'
-	;;
-esac

run-tests

@@ -35,9 +35,13 @@ if [ -n "$TEST_SHLIB_DIR" ] ; then
   DYLD_LIBRARY_PATH="$TEST_SHLIB_DIR"
   # For Windows
   PATH="${TEST_SHLIB_DIR}:${PATH}"
+  # For Wine
+  WINEPATH="${TEST_SHLIB_DIR}"
+
   export LD_LIBRARY_PATH
   export DYLD_LIBRARY_PATH
   export PATH
+  export WINEPATH
 fi
 
 # When used in make rules, we sometimes get the filenames VPATH

testsuite/setup-env

-#! /bin/sh
-
-set -e
-
-# Workaround, it seems difficult to convince wine to put ../lib into PATH.
-case "$EMULATOR" in
-    wine*)
-	for f in ../.lib/*.dll ; do
-	  ln -sf "$f" .
-	done
-	;;
-esac

testsuite/teardown-env

 #! /bin/sh
 
 rm -rf testkey.priv testkey.pub testtmp testsignature testsignature2
-
-case "$EMULATOR" in
-    wine*)
-	find . -type l -name '*.dll' -exec rm -f '{}' ';'
-	;;
-esac