Permalink
Browse files

Run full test with a fake bytecode only setup (Closes: #1306).

  • Loading branch information...
1 parent 752051e commit 4d439736f4658677ab653ca89325b0fc306545a5 @gildor478 gildor478 committed Nov 21, 2013
Showing with 105 additions and 83 deletions.
  1. +1 −1 _oasis
  2. +8 −1 src/base/BaseSetup.ml
  3. +4 −4 test/TestCommon.ml
  4. +77 −69 test/TestFull.ml
  5. +15 −8 test/TestFullUtils.ml
View
@@ -209,7 +209,7 @@ Executable test
Test main
Type: custom (0.3)
- Command: $test -oasis $oasis
+ Command: $test -oasis $oasis -is_native $is_native -native_dynlink $native_dynlink
WorkingDirectory: test
TestTools: oasis, test
@@ -171,6 +171,9 @@ let all t args =
let rno_test =
ref false
in
+ let arg_rest =
+ ref []
+ in
Arg.parse_argv
~current:(ref 0)
(Array.of_list
@@ -184,12 +187,16 @@ let all t args =
"-no-test",
Arg.Set rno_test,
s_ "Don't run test target";
+
+ "--",
+ Arg.Rest (fun arg -> arg_rest := arg :: !arg_rest),
+ s_ "All arguments for configure.";
]
(failwithf (f_ "Don't know what to do with '%s'"))
"";
info "Running configure step";
- configure t [||];
+ configure t (Array.of_list (List.rev !arg_rest));
info "Running build step";
build t [||];
View
@@ -50,16 +50,16 @@ module MapString = Map.Make(String)
module SetString = Set.Make(String)
-let has_ocamlopt =
+let is_native =
Conf.make_bool
- "has_ocamlopt"
+ "is_native"
(bool_of_string (BaseStandardVar.is_native ()))
"Wether native compilation possible."
-let has_native_dynlink =
+let native_dynlink =
Conf.make_bool
- "has_native_dynlink"
+ "native_dynlink"
(bool_of_string (BaseStandardVar.native_dynlink ()))
"Wether native dynlink is possible."
Oops, something went wrong.

0 comments on commit 4d43973

Please sign in to comment.