From aadc6a87fc55318439cce4b684c309071dc22e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Wi=C3=9Fmann?= <edu@thorsten-wissmann.de>
Date: Mon, 21 Jul 2014 14:33:15 +0200
Subject: [PATCH] Flush stdout more often in testsuite
---
src/testsuite/Testsuite.ml | 2 ++
src/testsuite/cool-testsuite.ml | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/testsuite/Testsuite.ml b/src/testsuite/Testsuite.ml
index 80e053d..63fb1fd 100644
--- a/src/testsuite/Testsuite.ml
+++ b/src/testsuite/Testsuite.ml
@@ -58,12 +58,14 @@ let runSatCheckVerbose (sc:satCheck) =
let (expectation,_,title) = sc in
PF.printf "Is %s " (cs "1" (columnCreate 60 title));
PF.printf "%s? → " (sotr expectation);
+ flush stdout;
let res = runSatCheck sc in
(if (res = expectation)
then PF.printf "%s\n" (cs "1;32" "Yes")
else PF.printf "%s, it is %s\n"
(cs "1;31" "No")
(sotr res));
+ flush stdout;
res
diff --git a/src/testsuite/cool-testsuite.ml b/src/testsuite/cool-testsuite.ml
index 682b081..6a5d9ab 100644
--- a/src/testsuite/cool-testsuite.ml
+++ b/src/testsuite/cool-testsuite.ml
@@ -117,6 +117,10 @@ let testcases =
; kAndKd_testcases
; c "K+KD" kOrKd_testcases
; pml_testcases
+ ; use_functor "PML + K"
+ [ sat "(P4 + False)"
+ ; sat "(({>= 3/5} p0 & {>= 2/5} p1) + False)"
+ ]
]
let main =
@@ -124,8 +128,10 @@ let main =
let failed = ref 0 in
foreach_l testcases (fun (name,table) ->
Printf.printf "==== Testing %s ====\n" name;
+ (*
let (_,sorts,_) = List.hd table in
Printf.printf "sortTable = %s\n" (FP.stringFromSortTable sorts);
+ *)
foreach_l table (fun sc ->
let (expected,_,_) = sc in
let actual = runSatCheckVerbose sc in
@@ -134,7 +140,7 @@ let main =
then success := !success + 1
else failed := !failed + 1
);
- Printf.printf "\n"
+ print_endline ""
);
let s n = if n = 1 then "testcase" else "testcases" in
Printf.printf "=> %d %s succeeded, %d %s failed.\n"
--
GitLab