diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-01-15T08·54+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-01-15T08·54+0000 |
| commit | e4b0666f8eee3fc48f37c0cd3fd194c27652173c (patch) | |
| tree | 4b4b8ad37e86ec30c45952c364866d1be1437901 /tests | |
| parent | 63f3ce6d9a26cb46a2f066dd9c5f2af25b3610df (diff) | |
* builtins.filterSource: pass the type of the file ("regular",
"directory", "symlink") as the second argument to the filter predicate.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/filter-source.nix.in | 4 | ||||
| -rw-r--r-- | tests/filter-source.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/filter-source.nix.in b/tests/filter-source.nix.in index 2b5c23d317..8493835c2b 100644 --- a/tests/filter-source.nix.in +++ b/tests/filter-source.nix.in @@ -3,5 +3,7 @@ derivation { system = "@system@"; builder = "@shell@"; args = ["-e" "-x" (builtins.toFile "builder" "PATH=@testPath@; ln -s $input $out")]; - input = builtins.filterSource (path: baseNameOf (toString path) != "foo") ./test-tmp/filterin; + input = + let filter = path: type: type != "symlink" && baseNameOf (toString path) != "foo"; + in builtins.filterSource filter ./test-tmp/filterin; } diff --git a/tests/filter-source.sh b/tests/filter-source.sh index 4880969ba7..96ccaedca0 100644 --- a/tests/filter-source.sh +++ b/tests/filter-source.sh @@ -5,9 +5,11 @@ mkdir $TEST_ROOT/filterin mkdir $TEST_ROOT/filterin/foo touch $TEST_ROOT/filterin/foo/bar touch $TEST_ROOT/filterin/xyzzy +ln -s xyzzy $TEST_ROOT/filterin/link $NIX_BIN_DIR/nix-build ./filter-source.nix -o $TEST_ROOT/filterout set -x test ! -e $TEST_ROOT/filterout/foo/bar test -e $TEST_ROOT/filterout/xyzzy +test ! -L $TEST_ROOT/filterout/link |