JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make-tarball / lib-tests: reduce duplication

Browse Source 
The misc.nix and systems.nix tests were invoked at three different
places. Let's not that.
This commit is contained in:
Frederik Rietdijk 2019-07-10 11:45:52 +02:00 committed by Frederik Rietdijk
parent 8074133844
commit 8931db9f0b
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/tests/release.nix
View File

@ -1,11 +1,9 @@
{ pkgs ? import ((import ../.).cleanSource ../..) {} }: { pkgs ? import ((import ../.).cleanSource ../..) {} }:
pkgs.stdenv.mkDerivation { pkgs.runCommandNoCC "nixpkgs-lib-tests" {
name = "nixpkgs-lib-tests"; buildInputs = [ pkgs.nix (import ./check-eval.nix) ];
buildInputs = [ pkgs.nix ];
NIX_PATH="nixpkgs=${pkgs.path}"; NIX_PATH="nixpkgs=${pkgs.path}";
} ''
buildCommand = ''
datadir="${pkgs.nix}/share" datadir="${pkgs.nix}/share"
export TEST_ROOT=$(pwd)/test-tmp export TEST_ROOT=$(pwd)/test-tmp
export NIX_BUILD_HOOK= export NIX_BUILD_HOOK=
@ -22,10 +20,5 @@ pkgs.stdenv.mkDerivation {
cd ${pkgs.path}/lib/tests cd ${pkgs.path}/lib/tests
bash ./modules.sh bash ./modules.sh
[[ "$(nix-instantiate --eval --strict misc.nix)" == "[ ]" ]]
[[ "$(nix-instantiate --eval --strict systems.nix)" == "[ ]" ]]
touch $out touch $out
''; ''
}

17
pkgs/top-level/make-tarball.nix
View File

@ -6,6 +6,7 @@
, officialRelease , officialRelease
, pkgs ? import nixpkgs.outPath {} , pkgs ? import nixpkgs.outPath {}
, nix ? pkgs.nix , nix ? pkgs.nix
, lib-tests ? import ../../lib/tests/release.nix { inherit pkgs; }
}: }:
with pkgs; with pkgs;
@ -18,7 +19,7 @@ releaseTools.sourceTarball rec {
version = pkgs.lib.fileContents ../../.version; version = pkgs.lib.fileContents ../../.version;
versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
buildInputs = [ nix.out jq ]; buildInputs = [ nix.out jq lib-tests ];
configurePhase = '' configurePhase = ''
eval "$preConfigure" eval "$preConfigure"
@ -60,20 +61,6 @@ releaseTools.sourceTarball rec {
exit 1 exit 1
fi fi
# Run the regression tests in `lib'.
if
# `set -e` doesn't work inside here, so need to && instead :(
res="$(nix-instantiate --eval --strict lib/tests/misc.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]] \
&& res="$(nix-instantiate --eval --strict lib/tests/systems.nix --show-trace)" \
&& [[ "$res" == "[ ]" ]]
then
true
else
echo "regression tests for lib failed, got: $res"
exit 1
fi
# Check that all-packages.nix evaluates on a number of platforms without any warnings. # Check that all-packages.nix evaluates on a number of platforms without any warnings.
for platform in i686-linux x86_64-linux x86_64-darwin; do for platform in i686-linux x86_64-linux x86_64-darwin; do
header "checking Nixpkgs on $platform" header "checking Nixpkgs on $platform"