From f84550b98a16ee260c16dd34419b419353b09d15 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 27 Apr 2018 21:34:48 +0700
Subject: [PATCH 1/3] Tag jsoo and utop tests as taking externals

---
 test/blackbox-tests/gen_tests.ml | 3 ++-
 test/blackbox-tests/jbuild.inc   | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/blackbox-tests/gen_tests.ml b/test/blackbox-tests/gen_tests.ml
index 66295586..be98ad85 100644
--- a/test/blackbox-tests/gen_tests.ml
+++ b/test/blackbox-tests/gen_tests.ml
@@ -89,7 +89,7 @@ end
 
 let exclusions =
   let open Test in
-  [ make "js_of_ocaml" ~js:true ~env:("NODE", "${bin:node}")
+  [ make "js_of_ocaml" ~external_deps:true ~js:true ~env:("NODE", "${bin:node}")
   ; make "github25" ~env:("OCAMLPATH", "./findlib-packages")
   ; make "odoc" ~external_deps:true ~skip_ocaml:"4.02.3"
   ; make "multiple-private-libs"  ~skip_ocaml:"4.02.3"
@@ -100,6 +100,7 @@ let exclusions =
   ; make "private-public-overlap" ~external_deps:true
   ; make "reason" ~enabled:false
   ; make "menhir"~external_deps:true
+  ; make "utop"~external_deps:true
   ; make "configurator" ~skip_platforms:[Win]
   ]
 
diff --git a/test/blackbox-tests/jbuild.inc b/test/blackbox-tests/jbuild.inc
index c445b166..3dd518a1 100644
--- a/test/blackbox-tests/jbuild.inc
+++ b/test/blackbox-tests/jbuild.inc
@@ -508,7 +508,6 @@
     (alias inline_tests)
     (alias installable-dup-private-libs)
     (alias intf-only)
-    (alias js_of_ocaml)
     (alias lib-available)
     (alias loop)
     (alias merlin-tests)
@@ -525,8 +524,7 @@
     (alias redirections)
     (alias scope-bug)
     (alias scope-ppx-bug)
-    (alias select)
-    (alias utop)))))
+    (alias select)))))
 
 (alias ((name runtest-disabled) (deps ((alias reason)))))
 

From 558b372cf0b25f7688b9bb5f591c3ec8541ca694 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 27 Apr 2018 21:55:43 +0700
Subject: [PATCH 2/3] Add unit tests to target without deps

---
 test/jbuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/jbuild b/test/jbuild
index 8a85ce36..860c88b2 100644
--- a/test/jbuild
+++ b/test/jbuild
@@ -74,3 +74,8 @@ Printf.fprintf (open_out Sys.argv.(2)) \"%g\n%!\" (Sys.time ())
 (rule ((targets (08.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
 (rule ((targets (09.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
 (rule ((targets (10.bar)) (action (run ./incr.exe y ${@})) (locks (m))))
+
+(alias
+ ((name runtest-no-deps)
+  (deps ((alias_rec blackbox-tests/runtest-no-deps)
+         (alias_rec unit-tests/runtest)))))

From 40631805ef3253d4abac4e3c10b2aa36b3aab723 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Fri, 27 Apr 2018 23:08:10 +0700
Subject: [PATCH 3/3] Multiple private libs requires odoc

---
 test/blackbox-tests/gen_tests.ml | 2 +-
 test/blackbox-tests/jbuild.inc   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/blackbox-tests/gen_tests.ml b/test/blackbox-tests/gen_tests.ml
index be98ad85..09067372 100644
--- a/test/blackbox-tests/gen_tests.ml
+++ b/test/blackbox-tests/gen_tests.ml
@@ -92,7 +92,7 @@ let exclusions =
   [ make "js_of_ocaml" ~external_deps:true ~js:true ~env:("NODE", "${bin:node}")
   ; make "github25" ~env:("OCAMLPATH", "./findlib-packages")
   ; make "odoc" ~external_deps:true ~skip_ocaml:"4.02.3"
-  ; make "multiple-private-libs"  ~skip_ocaml:"4.02.3"
+  ; make "multiple-private-libs" ~external_deps:true ~skip_ocaml:"4.02.3"
   ; make "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true
   ; make "odoc-unique-mlds" ~skip_ocaml:"4.02.3" ~external_deps:true
   ; make "output-obj" ~skip_platforms:[Mac; Win] ~skip_ocaml:"<4.06.0"
diff --git a/test/blackbox-tests/jbuild.inc b/test/blackbox-tests/jbuild.inc
index 3dd518a1..6f8e371b 100644
--- a/test/blackbox-tests/jbuild.inc
+++ b/test/blackbox-tests/jbuild.inc
@@ -513,7 +513,6 @@
     (alias merlin-tests)
     (alias meta-gen)
     (alias misc)
-    (alias multiple-private-libs)
     (alias null-dep)
     (alias ocaml-syntax)
     (alias ocamldep-multi-stanzas)