The following commit has been merged in the ocamlbuild branch: commit 2cb36cbf7d478f23e23478f8508665f57dc9d629 Author: Mehdi Dogguy <me...@debian.org> Date: Fri Mar 26 00:54:51 2010 +0100
Simplify tests rules diff --git a/myocamlbuild.ml b/myocamlbuild.ml index 48c2e3e..4f4078f 100644 --- a/myocamlbuild.ml +++ b/myocamlbuild.ml @@ -150,21 +150,19 @@ let _ = ) in let test = "tests/%.ml" in - let rule_native = "test-%" in - let rule_byte = "test-%-byte" in - let bin_native = "tests/%.native" in - let bin_byte = "tests/%.byte" in - let a_rule_native = "ascii-%" in - let a_rule_byte = "ascii-%-byte" in + let test_opt = "test-%" in + let test_byte = "test-%-byte" in + let a_test_native = "ascii-%" in + let a_test_byte = "ascii-%-byte" in let pa_test = "pa-%.ml" in - rule rule_native ~stamp:rule_native ~deps:([cmxa; gui_native; bin_native]) + rule test_opt ~stamp:test_opt ~deps:([cmxa; gui_native; "tests/%.native"]) (test_cmd "native" gui_native); - rule rule_byte ~stamp:rule_byte ~deps:([cma; gui_byte; bin_byte]) + rule test_byte ~stamp:test_byte ~deps:([cma; gui_byte; "tests/%.byte"]) (test_cmd "byte" gui_byte); - rule a_rule_native ~stamp:a_rule_native ~deps:([cmxa; ascii_native; bin_native]) + rule a_test_native ~stamp:a_test_native ~deps:([cmxa; ascii_native; "tests/%.native"]) (test_cmd "native" ascii_native); - rule a_rule_byte ~stamp:a_rule_byte ~deps:([cmxa; ascii_byte; bin_byte]) + rule a_test_byte ~stamp:a_test_byte ~deps:([cmxa; ascii_byte; "tests/%.byte"]) (test_cmd "byte" ascii_byte); rule pa_test ~stamp:pa_test ~deps:([ test; pa_ocamlviz ]) (fun env _ -> -- ocamlviz packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits