forked from ocaml/ocaml
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathdune.patch
71 lines (68 loc) · 1.62 KB
/
dune.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
diff --git a/ocamltest/ocaml_compilers.ml b/ocamltest/ocaml_compilers.ml
index bb3ed6ae4..c3e635ddf 100644
--- a/ocamltest/ocaml_compilers.ml
+++ b/ocamltest/ocaml_compilers.ml
@@ -40,14 +40,20 @@ class compiler
method target = target
method program_variable =
+ Builtin_variables.program
+ (*
if Ocaml_backends.is_native host
then Builtin_variables.program2
else Builtin_variables.program
+ *)
method program_output_variable =
+ Some Builtin_variables.output
+ (*
if Ocaml_backends.is_native host
then None
else Some Builtin_variables.output
+ *)
method ! reference_file env prefix =
let default = tool#reference_file env prefix in
diff --git a/ocamltest/ocaml_tests.ml b/ocamltest/ocaml_tests.ml
index 964eaa2f6..acce5b1a3 100644
--- a/ocamltest/ocaml_tests.ml
+++ b/ocamltest/ocaml_tests.ml
@@ -22,16 +22,18 @@ open Ocaml_actions
let bytecode =
let opt_actions =
[
+(*
setup_ocamlc_opt_build_env;
ocamlc_opt;
check_ocamlc_opt_output;
compare_bytecode_programs
+*)
] in
{
test_name = "bytecode";
test_run_by_default = true;
test_actions =
- [
+ [
setup_ocamlc_byte_build_env;
ocamlc_byte;
check_ocamlc_byte_output;
@@ -43,15 +45,19 @@ let bytecode =
let native =
let opt_actions =
[
+(*
setup_ocamlopt_byte_build_env;
ocamlopt_byte;
check_ocamlopt_byte_output;
- run;
- check_program_output;
+*)
setup_ocamlopt_opt_build_env;
ocamlopt_opt;
check_ocamlopt_opt_output;
+ run;
+ check_program_output;
+(*
compare_native_programs;
+*)
] in
{
test_name = "native";