; code : string
; out_lexing : (Tiger_parser.token list) option
; out_parsing : Tiger_absyn.t option
- ; is_error_expected : (Tiger_error.t -> bool)
+ ; is_error_expected_semant : (Tiger_error.t -> bool)
}
type color =
let case
?(out_lexing)
?(out_parsing)
- ?(is_error_expected=(fun _ -> false))
+ ?(is_error_expected_semant=(fun _ -> false))
~code
name
=
; code
; out_lexing
; out_parsing
- ; is_error_expected
+ ; is_error_expected_semant
}
let bar_sep = String.make 80 '-'
let p_indent n = p "%s" (indent n)
let run tests =
- let error_count = ref 0 in
+ let failure_count = ref 0 in
let run_pass ~f ~input ~expect_output ~is_error_expected =
let output_status = "n/a" in
let output_value = None in
| Tiger_error.T e when is_error_expected e ->
status_pass () ~info:(Tiger_error.to_string e)
| Tiger_error.T e ->
- incr error_count;
+ incr failure_count;
status_fail () ~info:(Tiger_error.to_string e)
| e ->
- incr error_count;
+ incr failure_count;
status_fail () ~info:(Printexc.to_string e)
)
in
, output_value
)
| Error info ->
- incr error_count;
+ incr failure_count;
( status_fail ~info ()
, output_status
, output_value
| Some true ->
status_pass ()
| Some false ->
- incr error_count;
+ incr failure_count;
status_fail ()
in
let output_value = Some produced in
(execution_status, output_status, output_value)
in
+ let test_case_count = ref 0 in
List.iter tests ~f:(
- fun {name; code; out_lexing; out_parsing; is_error_expected} ->
+ fun
+ { name
+ ; code
+ ; out_lexing
+ ; out_parsing
+ ; is_error_expected_semant
+ }
+ ->
+ incr test_case_count;
let (stat_lex_exe, stat_lex_out_cmp, _) =
run_pass
~f:pass_lexing
~input:code
~expect_output:out_lexing
- ~is_error_expected
+ ~is_error_expected:(fun _ -> false)
in
let (stat_pars_exe, stat_pars_out_cmp, absyn_opt) =
run_pass
~f:pass_parsing
~input:code
~expect_output:out_parsing
- ~is_error_expected
+ ~is_error_expected:(fun _ -> false)
in
let (stat_semant_exe, stat_semant_out_cmp, _) =
run_pass
~f:pass_semant
~input:absyn_opt
~expect_output:(Some ())
- ~is_error_expected
+ ~is_error_expected:is_error_expected_semant
in
p "%s" bar_sep; p_ln ();
p "Test: %S" name; p_ln ();
p_indent 2; p "out: %s" stat_semant_out_cmp; p_ln ();
);
p "%s" bar_end; p_ln ();
- let failures = !error_count in
- let clr = (if failures = 0 then Green else Red) in
- p "Failures: %s" (color clr (string_of_int failures)); p_ln ();
+ p "%s"
+ ( let info =
+ s "%d failures in %d test cases" !failure_count !test_case_count
+ in
+ match !failure_count with
+ | 0 -> status_pass () ~info
+ | _ -> status_fail () ~info
+ );
+ p_ln ();
p "%s" bar_end; p_ln ();
- exit failures
+ exit !failure_count