From 6245f0d5298f613c39f999fd68bf21aee8d72945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 11 Jan 2012 16:58:49 +0000
Subject: [PATCH] tests: Run `download-using-manifests' via libtool so that
 dlopening works.

---
 substitute.mk      | 2 ++
 tests/common.sh.in | 3 +++
 tests/init.sh      | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/substitute.mk b/substitute.mk
index ede347007..96fc16bf5 100644
--- a/substitute.mk
+++ b/substitute.mk
@@ -1,5 +1,7 @@
 %: %.in Makefile
 	sed \
+	 -e "s^@abs_top_srcdir\@^$(abs_top_srcdir)^g" \
+	 -e "s^@abs_top_builddir\@^$(abs_top_builddir)^g" \
 	 -e "s^@extra1\@^$(extra1)^g" \
 	 -e "s^@prefix\@^$(prefix)^g" \
 	 -e "s^@bindir\@^$(bindir)^g" \
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 7504dc059..5619580a7 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -1,5 +1,8 @@
 set -e
 
+export top_srcdir="@abs_top_srcdir@"
+export top_builddir="@abs_top_builddir@"
+
 export TOP=$(pwd)/..
 
 export TEST_ROOT=$(pwd)/test-tmp
diff --git a/tests/init.sh b/tests/init.sh
index 9ce7985d7..4296f43b6 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -47,7 +47,9 @@ EOF
 cat > $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl <<EOF
 #! $SHELL -e
 export DYLD_LIBRARY_PATH=
-exec $TOP/scripts/download-using-manifests.pl "\$@"
+exec "$top_builddir/libtool" --mode=execute			\
+  -dlopen "$top_builddir/perl/libNixStore.la"			\
+  "$top_builddir/scripts/download-using-manifests.pl" "\$@"
 EOF
 chmod +x $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl