trivial-builders: Move test list closer

This commit is contained in:
Robert Hensing 2023-07-26 13:51:47 +02:00
parent d1dc8384ca
commit 89bdfd4687
2 changed files with 30 additions and 12 deletions

View File

@ -0,0 +1,29 @@
/*
Run all tests with:
cd nixpkgs
nix-build -A tests.trivial-builders
or run a specific test with:
cd nixpkgs
nix-build -A tests.trivial-builders.foo
*/
{ callPackage, lib }:
let
inherit (lib) recurseIntoAttrs;
in
recurseIntoAttrs {
concat = callPackage ./concat-test.nix {};
linkFarm = callPackage ./link-farm.nix {};
overriding = callPackage ../test-overriding.nix {};
references = callPackage ./references.nix {};
writeCBin = callPackage ./writeCBin.nix {};
writeScriptBin = callPackage ./writeScriptBin.nix {};
writeShellScript = callPackage ./write-shell-script.nix {};
writeShellScriptBin = callPackage ./writeShellScriptBin.nix {};
writeStringReferencesToFile = callPackage ./writeStringReferencesToFile.nix {};
writeTextFile = callPackage ./write-text-file.nix {};
}

View File

@ -66,18 +66,7 @@ with pkgs;
cuda = callPackage ./cuda { };
trivial-builders = recurseIntoAttrs {
writeCBin = callPackage ../build-support/trivial-builders/test/writeCBin.nix {};
writeScriptBin = callPackage ../build-support/trivial-builders/test/writeScriptBin.nix {};
writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {};
writeTextFile = callPackage ../build-support/trivial-builders/test/write-text-file.nix {};
writeShellScript = callPackage ../build-support/trivial-builders/test/write-shell-script.nix {};
writeShellScriptBin = callPackage ../build-support/trivial-builders/test/writeShellScriptBin.nix {};
references = callPackage ../build-support/trivial-builders/test/references.nix {};
overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
concat = callPackage ../build-support/trivial-builders/test/concat-test.nix {};
linkFarm = callPackage ../build-support/trivial-builders/test/link-farm.nix {};
};
trivial-builders = callPackage ../build-support/trivial-builders/test/default.nix {};
writers = callPackage ../build-support/writers/test.nix {};