matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of uses of %{first-dep} 

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
This commit is contained in:
Jeremie Dimino 2018-07-09 16:03:52 +01:00 committed by Rudi Grinberg
parent fd27e371bc
commit 04f62ecc03
11 changed files with 38 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jbuild.ml
View File

@ -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

8
test/blackbox-tests/test-cases/force-test/dune
View File

@ -1,7 +1 @@
(executable
(name f))
(alias
(name runtest)
(deps f.exe)
(action (run %{first-dep})))
(test (name f))

6
test/blackbox-tests/test-cases/github568/dune
View File

@ -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)

3
test/blackbox-tests/test-cases/github660/explicit-interfaces/dune
View File

@ -1,6 +1,5 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{first-dep})))
(action (run ./main.exe)))
(executable (name main))

3
test/blackbox-tests/test-cases/github660/no-interfaces/dune
View File

@ -1,6 +1,5 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{first-dep})))
(action (run ./main.exe)))
(executable (name main))

8
test/blackbox-tests/test-cases/misc/run.t
View File

@ -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

6
test/blackbox-tests/test-cases/output-obj/dune
View File

@ -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})))

3
test/blackbox-tests/test-cases/select/dune
View File

@ -10,5 +10,4 @@
(alias
(name runtest)
(deps main.exe)
(action (run %{first-dep})))
(action (run ./main.exe)))

7
test/unit-tests/configurator/dune
View File

@ -1,8 +1,3 @@
(executable
(test
(name test_configurator)
(libraries configurator))
(alias
(name runtest)
(deps ./test_configurator.exe)
(action (run %{first-dep})))

42
test/unit-tests/dune
View File

@ -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)))))

7
test/unit-tests/ocaml-config/dune
View File

@ -1,8 +1,3 @@
(executable
(test
(name gh637)
(libraries ocaml_config))
(alias
(name runtest)
(deps ./gh637.exe)
(action (run %{first-dep})))