[commit: testsuite] master: Fix other ghcilink tests on Win64 (9ef531f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9ef531fc8b63d3eceea57085c4dff6126644af0a

>---------------------------------------------------------------

commit 9ef531fc8b63d3eceea57085c4dff6126644af0a
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu May 3 12:52:31 2012 +0100

    Fix other ghcilink tests on Win64

>---------------------------------------------------------------

 tests/ghci/linking/Makefile                        |   24 ++++++++++----------
 ...-unknown-mingw32 => ghcilink005.stderr-mingw32} |    0 
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/ghci/linking/Makefile b/tests/ghci/linking/Makefile
index 4791712..e8dc782 100644
--- a/tests/ghci/linking/Makefile
+++ b/tests/ghci/linking/Makefile
@@ -57,12 +57,12 @@ ghcilink004 :
 	mkdir dir004
 	#
 	rm -f $(PKG004)
-	echo "name: test" >>$(PKG004)
-	echo "version: 1.0" >>$(PKG004)
-	echo "id: test-XXX" >>$(PKG004)
-	echo "library-dirs: `pwd`/dir004" >>$(PKG004)
-	echo "extra-libraries: foo" >>$(PKG004)
-	echo "[]" >$(LOCAL_PKGCONF004)
+	echo 'name: test' >>$(PKG004)
+	echo 'version: 1.0' >>$(PKG004)
+	echo 'id: test-XXX' >>$(PKG004)
+	echo 'library-dirs: $${pkgroot}' >>$(PKG004)
+	echo 'extra-libraries: foo' >>$(PKG004)
+	echo '[]' >$(LOCAL_PKGCONF004)
 	'$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF004) register $(PKG004) -v0
 	#
 	"$(TEST_HC)" -c f.c -o dir004/foo.o
@@ -85,12 +85,12 @@ ghcilink005 :
 	mkdir dir005
 	#
 	rm -f $(PKG005)
-	echo "name: test" >>$(PKG005)
-	echo "version: 1.0" >>$(PKG005)
-	echo "id: test-XXX" >>$(PKG005)
-	echo "library-dirs: `pwd`/dir005" >>$(PKG005)
-	echo "extra-libraries: foo" >>$(PKG005)
-	echo "[]" >$(LOCAL_PKGCONF005)
+	echo 'name: test' >>$(PKG005)
+	echo 'version: 1.0' >>$(PKG005)
+	echo 'id: test-XXX' >>$(PKG005)
+	echo 'library-dirs: $${pkgroot}' >>$(PKG005)
+	echo 'extra-libraries: foo' >>$(PKG005)
+	echo '[]' >$(LOCAL_PKGCONF005)
 	'$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF005) register $(PKG005) -v0
 	#
 	"$(TEST_HC)" -c -dynamic f.c -o dir005/foo.o
diff --git a/tests/ghci/linking/ghcilink005.stderr-i386-unknown-mingw32 b/tests/ghci/linking/ghcilink005.stderr-mingw32
similarity index 100%
rename from tests/ghci/linking/ghcilink005.stderr-i386-unknown-mingw32
rename to tests/ghci/linking/ghcilink005.stderr-mingw32