From b669d3d2e83d3c50238751b57cff3ed0ca39bc8a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Jan 2016 00:05:28 +0100
Subject: 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.
---
 tests/lexer.nix | 2 --
 tests/lexer.sh  | 3 ---
 tests/local.mk  | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 tests/lexer.nix
 delete mode 100644 tests/lexer.sh

(limited to 'tests')

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))
-- 
cgit 1.4.1