diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-05-01T09·56+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-05-01T09·56+0000 |
| commit | 6cecad2be0f7ced82658ec2a86bcf61583487959 (patch) | |
| tree | e412fb161e0cfac4bffeae6bfd96cff674a0f947 /tests | |
| parent | cce31b739c6d3e381824ac6fde3f06ccb02782af (diff) | |
* Allow string concatenations involving derivations, e.g.,
configureFlags = "--with-freetype2-library="
+ freetype + "/lib";
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dependencies.nix.in | 5 | ||||
| -rw-r--r-- | tests/lang/eval-okay-string.exp | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-string.nix | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/dependencies.nix.in b/tests/dependencies.nix.in index 920564955a..aec9ec5b5f 100644 --- a/tests/dependencies.nix.in +++ b/tests/dependencies.nix.in @@ -18,8 +18,9 @@ let { name = "dependencies"; system = "@system@"; builder = "@shell@"; - args = ["-e" "-x" ./dependencies.builder0.sh]; - inherit input1 input2; + args = ["-e" "-x" (./dependencies.builder0.sh + "/FOOBAR/../.")]; + input1 = input1 + "/."; + inherit input2; }; } \ No newline at end of file diff --git a/tests/lang/eval-okay-string.exp b/tests/lang/eval-okay-string.exp index 07741d1605..9c3f56c3f3 100644 --- a/tests/lang/eval-okay-string.exp +++ b/tests/lang/eval-okay-string.exp @@ -1 +1 @@ -Str("foobar/a/b/c/d") +Str("foobar/a/b/c/d/foo/xyzzy/foo.txt/../foo/x/y") diff --git a/tests/lang/eval-okay-string.nix b/tests/lang/eval-okay-string.nix index 19b60497a5..b5280a0cd1 100644 --- a/tests/lang/eval-okay-string.nix +++ b/tests/lang/eval-okay-string.nix @@ -1 +1 @@ -"foo" + "bar" + toString (/a/b + /c/d) +"foo" + "bar" + toString (/a/b + /c/d) + (/foo/bar + "/../xyzzy/." + "/foo.txt") + ("/../foo" + /x/y) |