Fix github25 tests

test/blackbox-tests/gen_tests.ml

@@ -90,7 +90,7 @@ end
 let exclusions =
   let open Test in
   [ make "js_of_ocaml" ~js:true ~env:("NODE", "${bin:node}")
-  ; make "github25" ~env:("OCAMLPATH", "../findlib-packages")
+  ; 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 "ppx-rewriter" ~skip_ocaml:"4.02.3" ~external_deps:true

test/blackbox-tests/jbuild.inc

@@ -125,7 +125,7 @@
   (action
    (setenv
     OCAMLPATH
-    ../findlib-packages
+    ./findlib-packages
     (chdir
      test-cases/github25
      (progn (run ${exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))))

test/blackbox-tests/test-cases/github25/run.t

@@ -7,21 +7,18 @@ problem. So jbuilder shouldn't crash because of "plop.ca-marche-pas"
 We need ocamlfind to run this test
 
   $ jbuilder build @install --display short --only hello
-  File "root/jbuild", line 5, characters 14-28:
-  Error: Library "plop.ca-marche" not found.
-  Hint: try: jbuilder external-lib-deps --missing --only-packages hello @install
         ocamlc root/.hello.objs/hello.{cmi,cmo,cmt}
       ocamlopt root/.hello.objs/hello.{cmx,o}
       ocamlopt root/hello.{a,cmxa}
       ocamlopt root/hello.cmxs
         ocamlc root/hello.cma
-  [1]
 
   $ jbuilder build @install --display short --only pas-de-bol 2>&1 | sed 's/[^ "]*findlib-packages/.../'
-  File "root/jbuild", line 11, characters 14-32:
-  Error: Library "plop.ca-marche-pas" not found.
-  Hint: try: jbuilder external-lib-deps --missing --only-packages pas-de-bol @install
       ocamldep root/a.ml.d
+  File ".../plop/META", line 1, characters 0-0:
+  Error: Library "une-lib-qui-nexiste-pas" not found.
+  -> required by library "plop.ca-marche-pas" in .../plop
+  Hint: try: jbuilder external-lib-deps --missing --only-packages pas-de-bol @install
       ocamldep root/b.ml.d
         ocamlc root/.pas_de_bol.objs/pas_de_bol.{cmi,cmo,cmt}
       ocamlopt root/.pas_de_bol.objs/pas_de_bol.{cmx,o}