Author: ludo
Date: Wed Jan 11 16:58:49 2012
New Revision: 31482
URL: https://nixos.org/websvn/nix/?rev=31482&sc=1
Log:
tests: Run `download-using-manifests' via libtool so that dlopening works.
Modified:
nix/trunk/substitute.mk
nix/trunk/tests/common.sh.in
nix/trunk/tests/init.sh
Modified: nix/trunk/substitute.mk
==============================================================================
--- nix/trunk/substitute.mk Wed Jan 11 16:44:42 2012 (r31481)
+++ nix/trunk/substitute.mk Wed Jan 11 16:58:49 2012 (r31482)
@@ -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" \
Modified: nix/trunk/tests/common.sh.in
==============================================================================
--- nix/trunk/tests/common.sh.in Wed Jan 11 16:44:42 2012 (r31481)
+++ nix/trunk/tests/common.sh.in Wed Jan 11 16:58:49 2012 (r31482)
@@ -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
Modified: nix/trunk/tests/init.sh
==============================================================================
--- nix/trunk/tests/init.sh Wed Jan 11 16:44:42 2012 (r31481)
+++ nix/trunk/tests/init.sh Wed Jan 11 16:58:49 2012 (r31482)
@@ -47,7 +47,9 @@
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
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
