end;
outcome
-let test_this raw_term =
+let test_this mqi_handle uri_pred raw_term =
let empty_context = [] in
- let (metasenv, cic_term) = BatchParser.parse raw_term in
+ let (metasenv, cic_term) = BatchParser.parse mqi_handle ~uri_pred raw_term in
let etype =
try
CicPp.ppterm (CicTypeChecker.type_of_aux' metasenv empty_context cic_term)
- with
- _ -> "MALFORMED"
+ with _ -> "MALFORMED"
in
let ereduced =
try
CicPp.ppterm (CicReduction.whd empty_context cic_term)
- with
- _ -> "MALFORMED"
+ with _ -> "MALFORMED"
in
{
term = raw_term; (* useless *)
("DUMP_ENVIRONMENT FAILURE, uncaught excecption " ^
Printexc.to_string exc) ;
raise exc
-;;
let restore_environment filename =
if Sys.file_exists filename then
end
else
CicEnvironment.empty ()
-;;
-let main generate dump fnames =
+let main mqi_handle generate dump fnames tryvars varsprefix =
+ let uri_pred = BatchParser.uri_pred_of_conf tryvars varsprefix in
if generate then
begin
(* gen mode *)
print_endline (sprintf "Generating regtest %s -> %s\n ..."
fname test_fname);
let raw_term = (parse_regtest fname).term in
- let result = test_this raw_term in
+ let result = test_this mqi_handle uri_pred raw_term in
print_test result test_fname ;
if dump then dump_environment env_fname ;
) fnames
let is_ok =
try
let expected = parse_regtest test_fname in
- let actual = test_this expected.term in
+ let actual = test_this mqi_handle uri_pred expected.term in
if dump then dump_environment env_fname ;
if as_expected report_fname expected actual then
(incr ok ; true)
in
let timediff = Unix.gettimeofday () -. time in
print (sprintf "done in %f seconds\t" timediff) ;
- print_endline (if is_ok then "\e[01;32m[ OK ]\e[00m" else "\e[01;31m[ FAILED ]\e[00m")
+ print_endline
+ (if is_ok then
+ "\e[01;32m[ OK ]\e[00m"
+ else
+ "\e[01;31m[ FAILED ]\e[00m")
) fnames ;
print_endline "*** Summary ***";
print_endline (sprintf "Succeeded: %d" !ok);
List.iter (fun fname -> print_endline (sprintf " %s failed :-(" fname))
(List.rev !nok)
end
-;;
let _ =
+
+ Helm_registry.load_from "gTopLevel.conf.xml";
+ HelmLogger.register_log_callback
+ (fun ?(append_NL = true) msg ->
+ (if append_NL then prerr_endline else prerr_string)
+ (HelmLogger.string_of_html_msg msg));
+
+ let mqi_debug_fun = ignore in
+ let mqi_handle = MQIConn.init mqi_debug_fun in
+
let fnames = ref [] in
let gen = ref false in
+ let tryvars = ref false in
let dump = ref false in
let nodump = ref false in
+ let varsprefix = ref "" in
let usage = "regtest [OPTION] ... test1 ..." in
let spec =
- ["-gen", Arg.Set gen, "generate the tests; implies -dump (unless -nodump is specified)" ;
- "--gen", Arg.Set gen, "generate the tests; implies -dump (unless -nodump is specified)" ;
- "-dump", Arg.Set dump, "dumps the final environment" ;
- "--dump", Arg.Set dump, "dumps the final environment" ;
- "-nodump", Arg.Set dump, "do not dump the final environment" ;
- "--nodump", Arg.Set dump, "do not dump the final environment" ]
+ ["-gen", Arg.Set gen,
+ "generate the tests; implies -dump (unless -nodump is specified)" ;
+ "--gen", Arg.Set gen,
+ "generate the tests; implies -dump (unless -nodump is specified)" ;
+ "-dump", Arg.Set dump, "dump the final environment" ;
+ "--dump", Arg.Set dump, "dump the final environment" ;
+ "-nodump", Arg.Set nodump, "do not dump the final environment" ;
+ "--nodump", Arg.Set nodump, "do not dump the final environment" ;
+ "-vars", Arg.Set tryvars, "try also variables" ;
+ "-novars", Arg.Clear tryvars, "do not try variables (default)" ;
+ "-varsprefix", Arg.Set_string varsprefix,
+ "limit variable choices to URIs beginning with prefix" ;
+ "--varsprefix", Arg.Set_string varsprefix,
+ "limit variable choices to URIs beginning with prefix" ;
+ ]
in
- Arg.parse spec (function filename -> fnames := filename::!fnames ) usage ;
+ Arg.parse spec (fun filename -> fnames := filename::!fnames ) usage ;
if !fnames = [] then
Arg.usage spec (Sys.argv.(0) ^ ": missing argument test. You must provide at least one test file.\n" ^ usage) ;
- main !gen ((!gen || !dump) && (not !nodump)) !fnames
-;;
+ main mqi_handle !gen ((!gen || !dump) && (not !nodump)) !fnames !tryvars !varsprefix;
+ MQIConn.close mqi_handle