nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 14:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Run `download-using-manifests' via libtool so that dlopening works.

Browse Source
This commit is contained in:
Ludovic Courtès 2012-01-11 16:58:49 +00:00
parent c5d9ccd810
commit 6245f0d529
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
substitute.mk
View File

@ -1,5 +1,7 @@
%: %.in Makefile %: %.in Makefile
sed \ 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^@extra1\@^$(extra1)^g" \
-e "s^@prefix\@^$(prefix)^g" \ -e "s^@prefix\@^$(prefix)^g" \
-e "s^@bindir\@^$(bindir)^g" \ -e "s^@bindir\@^$(bindir)^g" \

3
tests/common.sh.in
View File

@ -1,5 +1,8 @@
set -e set -e
export top_srcdir="@abs_top_srcdir@"
export top_builddir="@abs_top_builddir@"
export TOP=$(pwd)/.. export TOP=$(pwd)/..
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=$(pwd)/test-tmp

4
tests/init.sh
View File

@ -47,7 +47,9 @@ EOF
cat > $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl <<EOF cat > $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl <<EOF
#! $SHELL -e #! $SHELL -e
export DYLD_LIBRARY_PATH= 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 EOF
chmod +x $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl chmod +x $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl