aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-17 01:12:43 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-17 01:12:43 +0200
commitb08f4b0da98d0a2534626c01cbb0c3c3eb4713a1 (patch)
treec602619cc9148dcff116c2366fcfc9b3e127e8c0
parentd7625b5c2d6d9fd23708057957172c0446ffdabc (diff)
Test string semantics a bit more
-rw-r--r--tests/dependencies.builder0.sh3
-rw-r--r--tests/dependencies.nix6
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/dependencies.builder0.sh b/tests/dependencies.builder0.sh
index ea4116d90..b02108fe6 100644
--- a/tests/dependencies.builder0.sh
+++ b/tests/dependencies.builder0.sh
@@ -1,3 +1,6 @@
+[ "${input1: -2}" = /. ]
+[ "${input2: -2}" = /. ]
+
mkdir $out
echo $(cat $input1/foo)$(cat $input2/bar) > $out/foobar
diff --git a/tests/dependencies.nix b/tests/dependencies.nix
index 6f6a7e46f..687237add 100644
--- a/tests/dependencies.nix
+++ b/tests/dependencies.nix
@@ -9,14 +9,14 @@ let {
input2 = mkDerivation {
name = "dependencies-input-2";
- builder = ./dependencies.builder2.sh;
+ builder = "${./dependencies.builder2.sh}";
};
body = mkDerivation {
name = "dependencies";
- builder = ./dependencies.builder0.sh + "/FOOBAR/../.";
+ builder = ./dependencies.builder0.sh + "/FOOBAR/../.";
input1 = input1 + "/.";
- inherit input2;
+ input2 = "${input2}/.";
meta.description = "Random test package";
};