From 04f62ecc03636f342cd21a145d0e05aed1c61fb6 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Mon, 9 Jul 2018 16:03:52 +0100 Subject: [PATCH] Get rid of uses of %{first-dep} Signed-off-by: Jeremie Dimino --- src/jbuild.ml | 4 +- .../blackbox-tests/test-cases/force-test/dune | 8 +--- test/blackbox-tests/test-cases/github568/dune | 6 +-- .../github660/explicit-interfaces/dune | 3 +- .../test-cases/github660/no-interfaces/dune | 3 +- test/blackbox-tests/test-cases/misc/run.t | 8 ++-- .../blackbox-tests/test-cases/output-obj/dune | 6 +-- test/blackbox-tests/test-cases/select/dune | 3 +- test/unit-tests/configurator/dune | 7 +--- test/unit-tests/dune | 42 +++++++++---------- test/unit-tests/ocaml-config/dune | 7 +--- 11 files changed, 38 insertions(+), 59 deletions(-) diff --git a/src/jbuild.ml b/src/jbuild.ml index ec76cdc2..04fb383c 100644 --- a/src/jbuild.ml +++ b/src/jbuild.ml @@ -1307,7 +1307,7 @@ module Rule = struct [ S.virt_text __POS__ "-q" ; S.virt_text __POS__ "-o" ; S.virt_var __POS__ "targets" - ; S.virt_var __POS__"first-dep" + ; S.virt_var __POS__"first-dep-tmp" ]))) ; mode ; locks = [] @@ -1328,7 +1328,7 @@ module Rule = struct Chdir (S.virt_var __POS__ "root", Run (S.virt_text __POS__ "ocamlyacc", - [S.virt_var __POS__ "first-dep"]))) + [S.virt_var __POS__ "first-dep-tmp"]))) ; mode ; locks = [] ; loc diff --git a/test/blackbox-tests/test-cases/force-test/dune b/test/blackbox-tests/test-cases/force-test/dune index 51e83746..6266b359 100644 --- a/test/blackbox-tests/test-cases/force-test/dune +++ b/test/blackbox-tests/test-cases/force-test/dune @@ -1,7 +1 @@ -(executable - (name f)) - -(alias - (name runtest) - (deps f.exe) - (action (run %{first-dep}))) +(test (name f)) diff --git a/test/blackbox-tests/test-cases/github568/dune b/test/blackbox-tests/test-cases/github568/dune index 46bee013..62257193 100644 --- a/test/blackbox-tests/test-cases/github568/dune +++ b/test/blackbox-tests/test-cases/github568/dune @@ -7,8 +7,7 @@ (alias (name runtest) (package lib1) - (deps test1.exe) - (action (run %{first-dep}))) + (action (run ./test1.exe))) (executable (name test1) @@ -24,8 +23,7 @@ (alias (name runtest) (package lib2) - (deps test2.exe) - (action (run %{first-dep}))) + (action (run ./test2.exe))) (executable (name test2) diff --git a/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune index 7817f984..beef01da 100644 --- a/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune +++ b/test/blackbox-tests/test-cases/github660/explicit-interfaces/dune @@ -1,6 +1,5 @@ (alias (name runtest) - (deps main.exe) - (action (run %{first-dep}))) + (action (run ./main.exe))) (executable (name main)) diff --git a/test/blackbox-tests/test-cases/github660/no-interfaces/dune b/test/blackbox-tests/test-cases/github660/no-interfaces/dune index 7817f984..beef01da 100644 --- a/test/blackbox-tests/test-cases/github660/no-interfaces/dune +++ b/test/blackbox-tests/test-cases/github660/no-interfaces/dune @@ -1,6 +1,5 @@ (alias (name runtest) - (deps main.exe) - (action (run %{first-dep}))) + (action (run ./main.exe))) (executable (name main)) diff --git a/test/blackbox-tests/test-cases/misc/run.t b/test/blackbox-tests/test-cases/misc/run.t index 0cc002ad..b0a157f5 100644 --- a/test/blackbox-tests/test-cases/misc/run.t +++ b/test/blackbox-tests/test-cases/misc/run.t @@ -4,8 +4,8 @@ diff alias runtest diff alias runtest (exit 1) (cd _build/default && /usr/bin/diff -u result expected) - --- result 2018-07-09 21:13:11.000000000 +0700 - +++ expected 2018-07-09 21:13:11.000000000 +0700 + --- result 2018-07-09 16:03:03.123914026 +0100 + +++ expected 2018-07-09 16:03:03.124914029 +0100 @@ -1 +1 @@ -c.txt b.txt a.txt dune \ No newline at end of file @@ -13,8 +13,8 @@ \ No newline at end of file diff alias runtest (exit 1) (cd _build/default && /usr/bin/diff -u result2 expected2) - --- result2 2018-07-09 21:13:11.000000000 +0700 - +++ expected2 2018-07-09 21:13:11.000000000 +0700 + --- result2 2018-07-09 16:03:03.124914029 +0100 + +++ expected2 2018-07-09 16:03:03.124914029 +0100 @@ -1 +1 @@ -sub-tree/dir/b sub-tree/a \ No newline at end of file diff --git a/test/blackbox-tests/test-cases/output-obj/dune b/test/blackbox-tests/test-cases/output-obj/dune index 591b5ab5..598ef9f3 100644 --- a/test/blackbox-tests/test-cases/output-obj/dune +++ b/test/blackbox-tests/test-cases/output-obj/dune @@ -33,7 +33,7 @@ (rule (targets dynamic.exe) (deps dynamic.c) - (action (run %{cc} -o %{targets} %{first-dep} %{ocaml-config:native_c_libraries}))) + (action (run %{cc} -o %{targets} %{deps} %{ocaml-config:native_c_libraries}))) (alias (name runtest) @@ -48,9 +48,9 @@ (alias (name runtest) (deps test.bc%{ext_dll}) - (action (run ./dynamic.exe ./%{first-dep}))) + (action (run ./dynamic.exe ./%{deps}))) (alias (name runtest) (deps test%{ext_dll}) - (action (run ./dynamic.exe ./%{first-dep}))) + (action (run ./dynamic.exe ./%{deps}))) diff --git a/test/blackbox-tests/test-cases/select/dune b/test/blackbox-tests/test-cases/select/dune index 4e6a6b1f..a25653ec 100644 --- a/test/blackbox-tests/test-cases/select/dune +++ b/test/blackbox-tests/test-cases/select/dune @@ -10,5 +10,4 @@ (alias (name runtest) - (deps main.exe) - (action (run %{first-dep}))) + (action (run ./main.exe))) diff --git a/test/unit-tests/configurator/dune b/test/unit-tests/configurator/dune index 1e259288..034d70a9 100644 --- a/test/unit-tests/configurator/dune +++ b/test/unit-tests/configurator/dune @@ -1,8 +1,3 @@ -(executable +(test (name test_configurator) (libraries configurator)) - -(alias - (name runtest) - (deps ./test_configurator.exe) - (action (run %{first-dep}))) diff --git a/test/unit-tests/dune b/test/unit-tests/dune index 7ee04560..aa2f0eef 100644 --- a/test/unit-tests/dune +++ b/test/unit-tests/dune @@ -18,72 +18,72 @@ (alias (name runtest) - (deps tests.mlt + (deps (:t tests.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi) (source_tree toolchain.d) (source_tree findlib-db)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps filename.mlt + (deps (:t filename.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps import_dot_map.mlt + (deps (:t import_dot_map.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps action.mlt + (deps (:t action.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps path.mlt + (deps (:t path.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps sexp.mlt + (deps (:t sexp.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) (alias (name runtest) - (deps jbuild.mlt + (deps (:t jbuild.mlt) (glob_files %{project_root}/src/.dune.objs/*.cmi) (glob_files %{project_root}/src/stdune/.stdune.objs/*.cmi)) (action (chdir %{project_root} (progn - (run %{exe:expect_test.exe} %{first-dep}) - (diff? %{first-dep} %{first-dep}.corrected))))) + (run %{exe:expect_test.exe} %{t}) + (diff? %{t} %{t}.corrected))))) diff --git a/test/unit-tests/ocaml-config/dune b/test/unit-tests/ocaml-config/dune index 659d3aa3..cb4d4096 100644 --- a/test/unit-tests/ocaml-config/dune +++ b/test/unit-tests/ocaml-config/dune @@ -1,8 +1,3 @@ -(executable +(test (name gh637) (libraries ocaml_config)) - -(alias - (name runtest) - (deps ./gh637.exe) - (action (run %{first-dep})))