about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-19T23·05+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-01-19T23·05+0100
commitb669d3d2e83d3c50238751b57cff3ed0ca39bc8a (patch)
treeda6578e8885e1c12a7d4d94634bfa4fb31b0c171 /tests
parent7db05781a680028380aed6a01f2a74c68907bad7 (diff)
Revert "next try for "don't abort when given unmatched '}' with 'start-condition stack underflow'. This fixes #751""
This reverts commit ed23c8568e10d15196bb4ff2b79fc14191d28109. Let's
merge this *after* the 1.11.1 release.
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, 1 insertions, 6 deletions
diff --git a/tests/lexer.nix b/tests/lexer.nix
deleted file mode 100644
index 05c78b3016d3..000000000000
--- a/tests/lexer.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-let const = a: "const"; in
-''${ const { x = "q"; }}''
diff --git a/tests/lexer.sh b/tests/lexer.sh
deleted file mode 100644
index e45a6b00a542..000000000000
--- a/tests/lexer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-source common.sh
-
-nix-instantiate --eval ./lexer.nix
diff --git a/tests/local.mk b/tests/local.mk
index 05c6e04ee17e..03f53b44c275 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 lexer.sh
+  check-reqs.sh pass-as-file.sh tarball.sh
   # parallel.sh
 
 install-tests += $(foreach x, $(nix_tests), tests/$(x))