From 721c80273a5a8359aa35b8a785b54cbb772f6c46 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Tue, 30 Jan 2018 20:19:02 +0800
Subject: [PATCH] Update ppx scope tests

---
 .../test-cases/ppx-rewriter/run.t             |  2 +-
 .../test-cases/scope-ppx-bug/run.t            | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/run.t b/test/blackbox-tests/test-cases/ppx-rewriter/run.t
index 6aedd1a7..fdc70578 100644
--- a/test/blackbox-tests/test-cases/ppx-rewriter/run.t
+++ b/test/blackbox-tests/test-cases/ppx-rewriter/run.t
@@ -3,7 +3,7 @@
         ocamlc ppx/fooppx.{cmi,cmo,cmt}
       ocamlopt ppx/fooppx.{cmx,o}
       ocamlopt ppx/fooppx.{a,cmxa}
-      ocamlopt .ppx/fooppx/ppx.exe
+      ocamlopt .ppx/fooppx@/ppx.exe
            ppx w_omp_driver.pp.ml
       ocamldep w_omp_driver.depends.ocamldep-output
         ocamlc w_omp_driver.{cmi,cmo,cmt}
diff --git a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
index 24e1daf9..2c5f09c5 100644
--- a/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
+++ b/test/blackbox-tests/test-cases/scope-ppx-bug/run.t
@@ -1,5 +1,22 @@
   $ $JBUILDER build -j1 --root . @install
-  Error: External library "a_kernel" not found.
-  -> required by "required by (pps (a_kernel))"
-  Hint: try: jbuilder external-lib-deps --missing --root . @install
-  [1]
+      ocamldep a/ppx/a.depends.ocamldep-output
+        ocamlc a/ppx/a.{cmi,cmo,cmt}
+      ocamldep a/kernel/a_kernel.depends.ocamldep-output
+        ocamlc a/kernel/a_kernel.{cmi,cmo,cmt}
+      ocamlopt a/ppx/a.{cmx,o}
+        ocamlc a/ppx/a.cma
+      ocamlopt a/kernel/a_kernel.{cmx,o}
+        ocamlc a/kernel/a_kernel.cma
+      ocamlopt a/ppx/a.{a,cmxa}
+      ocamlopt a/kernel/a_kernel.{a,cmxa}
+      ocamlopt a/ppx/a.cmxs
+      ocamlopt a/kernel/a_kernel.cmxs
+      ocamlopt .ppx/a.kernel/ppx.exe
+      ocamlopt .ppx/a/ppx.exe
+           ppx b/b.pp.ml
+      ocamldep b/b.depends.ocamldep-output
+        ocamlc b/b.{cmi,cmo,cmt}
+      ocamlopt b/b.{cmx,o}
+        ocamlc b/b.cma
+      ocamlopt b/b.{a,cmxa}
+      ocamlopt b/b.cmxs