about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-01-19T21·24-0500
committerShea Levy <shea@shealevy.com>2016-01-19T21·24-0500
commit7db05781a680028380aed6a01f2a74c68907bad7 (patch)
treec772d515642ead544927c5fd25623ffba8341d46 /tests
parent9fff4925613d44ac12775ad8840709130b9498d1 (diff)
parented23c8568e10d15196bb4ff2b79fc14191d28109 (diff)
Merge branch 'lexer-regression-fix' of git://github.com/fkz/nix
Diffstat (limited to 'tests')
-rw-r--r--tests/lexer.nix2
-rw-r--r--tests/lexer.sh3
-rw-r--r--tests/local.mk2
3 files changed, 6 insertions, 1 deletions
diff --git a/tests/lexer.nix b/tests/lexer.nix
new file mode 100644
index 000000000000..05c78b3016d3
--- /dev/null
+++ b/tests/lexer.nix
@@ -0,0 +1,2 @@
+let const = a: "const"; in
+''${ const { x = "q"; }}''
diff --git a/tests/lexer.sh b/tests/lexer.sh
new file mode 100644
index 000000000000..e45a6b00a542
--- /dev/null
+++ b/tests/lexer.sh
@@ -0,0 +1,3 @@
+source common.sh
+
+nix-instantiate --eval ./lexer.nix
diff --git a/tests/local.mk b/tests/local.mk
index 03f53b44c275..05c6e04ee17e 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -11,7 +11,7 @@ nix_tests = \
   binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \
   multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \
   binary-cache.sh nix-profile.sh repair.sh dump-db.sh case-hack.sh \
-  check-reqs.sh pass-as-file.sh tarball.sh
+  check-reqs.sh pass-as-file.sh tarball.sh lexer.sh
   # parallel.sh
 
 install-tests += $(foreach x, $(nix_tests), tests/$(x))