From 6cecad2be0f7ced82658ec2a86bcf61583487959 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 May 2006 09:56:56 +0000 Subject: * Allow string concatenations involving derivations, e.g., configureFlags = "--with-freetype2-library=" + freetype + "/lib"; --- tests/dependencies.nix.in | 5 +++-- tests/lang/eval-okay-string.exp | 2 +- tests/lang/eval-okay-string.nix | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/dependencies.nix.in b/tests/dependencies.nix.in index 920564955a53..aec9ec5b5f15 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 07741d1605ce..9c3f56c3f3b0 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 19b60497a52d..b5280a0cd1fa 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) -- cgit 1.4.1