diff --git a/.travis-ci.sh b/.travis-ci.sh index 60df3f45..ea2bf7ff 100644 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -46,7 +46,7 @@ case "$TARGET" in rm -rf ~/.opam opam init --yes eval $(opam config env) - opam install utop ppx_driver odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler--yes + opam install ocamlfind utop ppx_driver odoc menhir ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler--yes opam remove jbuilder `opam list --depends-on jbuilder --installed --short` --yes if opam info dune &> /dev/null; then opam remove dune `opam list --depends-on dune --installed --short` --yes @@ -82,7 +82,7 @@ case "$TARGET" in echo "depends: [\"dune\"]" >> jbuilder.opam opam pin add dune . --no-action --yes opam pin add jbuilder . --no-action --yes - opam install utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes + opam install ocamlfind utop ppx_driver odoc ocaml-migrate-parsetree js_of_ocaml-ppx js_of_ocaml-compiler --yes echo -en "travis_fold:end:opam.deps\r" fi echo -en "travis_fold:start:dune.bootstrap\r" diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/dune b/test/blackbox-tests/test-cases/ppx-rewriter/dune index 9fd8d486..5f67c406 100644 --- a/test/blackbox-tests/test-cases/ppx-rewriter/dune +++ b/test/blackbox-tests/test-cases/ppx-rewriter/dune @@ -13,4 +13,4 @@ (executable ((name w_ppx_driver_flags) (modules (w_ppx_driver_flags)) - (preprocess (pps (fooppx -flag (-arg omp) ppx_driver.runner))))) + (preprocess (pps (fooppx -flag (-arg omp) ppx_driver.runner))))) \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/fooppx.opam b/test/blackbox-tests/test-cases/ppx-rewriter/fooppx.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune b/test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune index 692b397d..ff90c7a3 100644 --- a/test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune +++ b/test/blackbox-tests/test-cases/ppx-rewriter/ppx/dune @@ -1,4 +1,5 @@ (library ((name fooppx) + (public_name fooppx) (kind ppx_rewriter) (libraries (ocaml-migrate-parsetree)))) diff --git a/test/blackbox-tests/test-cases/ppx-rewriter/run.t b/test/blackbox-tests/test-cases/ppx-rewriter/run.t index 76d09ccf..f055be4c 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.objs/fooppx.{cmi,cmo,cmt} ocamlopt ppx/.fooppx.objs/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.pp.ml.d ocamlc .w_omp_driver.eobjs/w_omp_driver.{cmi,cmo,cmt} @@ -18,3 +18,5 @@ ocamlopt w_ppx_driver.exe This test is broken because ppx_driver doesn't support migrate custom arguments # $ dune build ./w_ppx_driver_flags.exe --display short + $ dune build && dune exec -- ocamlfind opt -package fooppx -ppxopt "fooppx,-flag" -linkpkg w_omp_driver.ml -o w_omp_driver.exe + pass -arg to fooppx