mirror of
https://github.com/NixOS/nix
synced 2025-07-08 02:43:54 +02:00
Replace "make check" with "make installcheck"
Ensuring that the tests work from the build tree requires a growing number of nasty hacks. The tests also don't verify that the installed Nix actually works. Thus, the tests now require "make install" to have been run.
This commit is contained in:
parent
4b23900ff1
commit
ea402a255f
8 changed files with 25 additions and 46 deletions
|
@ -16,20 +16,6 @@ mkdir "$NIX_STATE_DIR"
|
|||
mkdir "$NIX_DB_DIR"
|
||||
mkdir "$NIX_CONF_DIR"
|
||||
|
||||
mkdir $NIX_BIN_DIR
|
||||
ln -s $TOP/src/nix-store/nix-store $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/nix-instantiate/nix-instantiate $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/nix-hash/nix-hash $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/nix-env/nix-env $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/nix-worker/nix-worker $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/bsdiff-*/bsdiff $NIX_BIN_DIR/
|
||||
ln -s $TOP/src/bsdiff-*/bspatch $NIX_BIN_DIR/
|
||||
ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/
|
||||
ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/
|
||||
ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/
|
||||
mkdir -p $NIX_BIN_DIR/nix/substituters
|
||||
ln -s $TOP/scripts/copy-from-other-stores.pl $NIX_BIN_DIR/nix/substituters
|
||||
|
||||
cat > "$NIX_CONF_DIR"/nix.conf <<EOF
|
||||
gc-keep-outputs = false
|
||||
gc-keep-derivations = false
|
||||
|
@ -37,21 +23,6 @@ env-keep-derivations = false
|
|||
fsync-metadata = false
|
||||
EOF
|
||||
|
||||
# An uberhack for Mac OS X 10.5: download-using-manifests uses Perl,
|
||||
# and Perl links against Darwin's libutil.dylib (in /usr/lib), but
|
||||
# when running "make check", the libtool wrapper script around the Nix
|
||||
# binaries sets DYLD_LIBRARY_PATH so that Perl finds Nix's (completely
|
||||
# different) libutil --- so it barfs. So generate a shell wrapper
|
||||
# around download-using-manifests that clears DYLD_LIBRARY_PATH.
|
||||
cat > $NIX_BIN_DIR/nix/substituters/download-using-manifests.pl <<EOF
|
||||
#! $SHELL -e
|
||||
export DYLD_LIBRARY_PATH=
|
||||
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
|
||||
|
||||
# Initialise the database.
|
||||
nix-store --init
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue