let rawsep = "###"
let sep = Pcre.regexp (sprintf "^%s" rawsep)
-let msg_prefix = "*** REGTEST *** "
-let print_msg s = prerr_endline (msg_prefix ^ s)
+let print s = print_string s; flush stdout
+let print_endline s = print_endline s
+let print_endline_to_channel ch s = output_string ch (s ^ "\n")
type state = Term | EMetasenv | ETerm | EType | EReduced
etype = Buffer.contents etype;
ereduced = Buffer.contents ereduced }
-let as_expected expected found = (* ignores "term" field *)
- let outcome = ref true in
- if expected.eterm <> found.eterm then begin
- print_msg "Term mismatch";
- print_msg " expected:";
- print_msg (" " ^ expected.eterm);
- print_msg " found:";
- print_msg (" " ^ found.eterm);
- outcome := false;
- end;
- if expected.emetasenv <> found.emetasenv then begin
- print_msg "Metasenv mismatch";
- print_msg " expected:";
- print_msg (" " ^ expected.emetasenv);
- print_msg " found:";
- print_msg (" " ^ found.emetasenv);
- outcome := false;
- end;
- if expected.etype <> found.etype then begin
- print_msg "Type mismatch";
- print_msg " expected:";
- print_msg (" " ^ expected.etype);
- print_msg " found:";
- print_msg (" " ^ found.etype);
- outcome := false;
- end;
- if expected.ereduced <> found.ereduced then begin
- print_msg "Reduced term mismatch";
- print_msg " expected:";
- print_msg (" " ^ expected.ereduced);
- print_msg " found:";
- print_msg (" " ^ found.ereduced);
- outcome := false;
- end;
- !outcome
+let as_expected report_fname expected found = (* ignores "term" field *)
+ let eterm_ok = expected.eterm = found.eterm in
+ let emetasenv_ok = expected.emetasenv = found.emetasenv in
+ let etype_ok = expected.etype = found.etype in
+ let ereduced_ok = expected.ereduced = found.ereduced in
+ let outcome = eterm_ok && emetasenv_ok && etype_ok && ereduced_ok in
+ if outcome then
+ (if Sys.file_exists report_fname then Sys.remove report_fname)
+ else
+ begin
+ let och = open_out report_fname in
+ let print_endline = print_endline_to_channel och in
+ if not eterm_ok then begin
+ print_endline "### Term mismatch ###";
+ print_endline "# expected:";
+ print_endline (" " ^ expected.eterm);
+ print_endline "# found:";
+ print_endline (" " ^ found.eterm);
+ end;
+ if not emetasenv_ok then begin
+ print_endline "### Metasenv mismatch ###";
+ print_endline "# expected:";
+ print_endline (" " ^ expected.emetasenv);
+ print_endline "# found:";
+ print_endline (" " ^ found.emetasenv);
+ end;
+ if not etype_ok then begin
+ print_endline "### Type mismatch ###";
+ print_endline "# expected:";
+ print_endline (" " ^ expected.etype);
+ print_endline "# found:";
+ print_endline (" " ^ found.etype);
+ end;
+ if expected.ereduced <> found.ereduced then begin
+ print_endline "### Reduced term mismatch ###";
+ print_endline "# expected:";
+ print_endline (" " ^ expected.ereduced);
+ print_endline "# found:";
+ print_endline (" " ^ found.ereduced);
+ end;
+ close_out och ;
+ end;
+ outcome
-let test_this raw_term =
+let test_this uri_pred raw_term =
let empty_context = [] in
- let (metasenv, cic_term) = BatchParser.parse raw_term in
+ let (metasenv, cic_term) = BatchParser.parse ~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 generate dump fnames tryvars varsprefix =
+ let uri_pred = BatchParser.uri_pred_of_conf tryvars varsprefix in
if generate then
begin
(* gen mode *)
- print_msg "[ Gen mode ]";
+ print_endline "[ Gen mode ]";
List.iter
(function fname ->
let test_fname = fname ^ ".test" in
let env_fname = fname ^ ".env" in
- print_msg (sprintf "Generating regtest %s -> %s\n ..."
+ 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 uri_pred raw_term in
print_test result test_fname ;
if dump then dump_environment env_fname ;
) fnames
end else
begin
(* regtest mode *)
- print_msg "[ Regtest mode ]";
+ print_endline "[ Regtest mode ]";
let (ok, nok) = (ref 0, ref []) in
List.iter
(function fname ->
let env_fname = fname ^ ".env" in
let test_fname = fname ^ ".test" in
+ let report_fname = fname ^ ".report" in
restore_environment env_fname ;
- prerr_endline ("# " ^ fname);
- try
- let expected = parse_regtest test_fname in
- let actual = test_this expected.term in
- if dump then dump_environment env_fname ;
- if as_expected expected actual then
- incr ok
- else
- nok := fname :: !nok;
- with e -> nok := fname :: !nok
+ let time = Unix.gettimeofday () in
+ print ("Processing " ^ fname ^":\t") ;
+ let is_ok =
+ try
+ let expected = parse_regtest test_fname in
+ let actual = test_this uri_pred expected.term in
+ if dump then dump_environment env_fname ;
+ if as_expected report_fname expected actual then
+ (incr ok ; true)
+ else
+ (nok := fname :: !nok ; false)
+ with e -> (nok := fname :: !nok ; false)
+ 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")
) fnames ;
- print_msg "Regtest completed:";
- print_msg (sprintf "Succeeded: %d" !ok);
- print_msg (sprintf "Failed: %d" (List.length !nok));
- List.iter (fun fname -> print_msg (sprintf " %s failed :-(" fname))
+ print_endline "*** Summary ***";
+ print_endline (sprintf "Succeeded: %d" !ok);
+ print_endline (sprintf "Failed: %d" (List.length !nok));
+ List.iter (fun fname -> print_endline (sprintf " %s failed :-(" fname))
(List.rev !nok)
end
-;;
let _ =
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 !gen ((!gen || !dump) && (not !nodump)) !fnames !tryvars !varsprefix
+
projects / helm.git / blobdiff