From bb2bf59ff1ef7a5438520aaec9c63c126ed20411 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Sat, 18 Aug 2018 09:51:40 +0300
Subject: [PATCH] Add test case for ocamllex + jbuild bug report

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
---
 test/blackbox-tests/dune.inc                           | 10 ++++++++++
 test/blackbox-tests/test-cases/ocamllex-jbuild/foo.mll |  8 ++++++++
 test/blackbox-tests/test-cases/ocamllex-jbuild/jbuild  |  5 +++++
 test/blackbox-tests/test-cases/ocamllex-jbuild/run.t   |  6 ++++++
 4 files changed, 29 insertions(+)
 create mode 100644 test/blackbox-tests/test-cases/ocamllex-jbuild/foo.mll
 create mode 100644 test/blackbox-tests/test-cases/ocamllex-jbuild/jbuild
 create mode 100644 test/blackbox-tests/test-cases/ocamllex-jbuild/run.t

diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc
index 6fefde28..58cfaa8a 100644
--- a/test/blackbox-tests/dune.inc
+++ b/test/blackbox-tests/dune.inc
@@ -570,6 +570,14 @@
    test-cases/ocamldep-multi-stanzas
    (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
 
+(alias
+ (name ocamllex-jbuild)
+ (deps (package dune) (source_tree test-cases/ocamllex-jbuild))
+ (action
+  (chdir
+   test-cases/ocamllex-jbuild
+   (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
+
 (alias
  (name odoc)
  (deps (package dune) (source_tree test-cases/odoc))
@@ -875,6 +883,7 @@
   (alias ocaml-config-macro)
   (alias ocaml-syntax)
   (alias ocamldep-multi-stanzas)
+  (alias ocamllex-jbuild)
   (alias odoc)
   (alias odoc-unique-mlds)
   (alias output-obj)
@@ -970,6 +979,7 @@
   (alias ocaml-config-macro)
   (alias ocaml-syntax)
   (alias ocamldep-multi-stanzas)
+  (alias ocamllex-jbuild)
   (alias output-obj)
   (alias package-dep)
   (alias path-variables)
diff --git a/test/blackbox-tests/test-cases/ocamllex-jbuild/foo.mll b/test/blackbox-tests/test-cases/ocamllex-jbuild/foo.mll
new file mode 100644
index 00000000..61581ffb
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamllex-jbuild/foo.mll
@@ -0,0 +1,8 @@
+{}
+
+rule f = parse
+  | _ { () }
+
+{
+  print_endline "foo"
+}
diff --git a/test/blackbox-tests/test-cases/ocamllex-jbuild/jbuild b/test/blackbox-tests/test-cases/ocamllex-jbuild/jbuild
new file mode 100644
index 00000000..172cb590
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamllex-jbuild/jbuild
@@ -0,0 +1,5 @@
+(ocamllex
+ ((modules (foo))))
+
+(executable
+ ((name foo)))
diff --git a/test/blackbox-tests/test-cases/ocamllex-jbuild/run.t b/test/blackbox-tests/test-cases/ocamllex-jbuild/run.t
new file mode 100644
index 00000000..75eaa6b7
--- /dev/null
+++ b/test/blackbox-tests/test-cases/ocamllex-jbuild/run.t
@@ -0,0 +1,6 @@
+  $ dune exec ./foo.exe
+  File "jbuild", line 2, characters 3-10:
+   ((modules (foo))))
+     ^^^^^^^
+  Error: S-expression of the form (<name> <values>...) expected
+  [1]