summaryrefslogtreecommitdiff
path: root/checklink
diff options
context:
space:
mode:
authorGravatar varobert <varobert@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2012-04-04 11:59:39 +0000
committerGravatar varobert <varobert@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2012-04-04 11:59:39 +0000
commitcaf14050d5fe108dc65e9c8d8df84633e84f79c8 (patch)
tree42cbc5f8f5934efcaedc13de2b2ce03c4c1799ba /checklink
parent9f9b003697ac901008affd7008c428109d1afc5e (diff)
Better error messages for data symbols
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@1869 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'checklink')
-rw-r--r--checklink/Check.ml15
-rw-r--r--checklink/Fuzz.ml2
2 files changed, 7 insertions, 10 deletions
diff --git a/checklink/Check.ml b/checklink/Check.ml
index dfefbfb..33914f2 100644
--- a/checklink/Check.ml
+++ b/checklink/Check.ml
@@ -2612,22 +2612,19 @@ let check_data (pv: (ident * unit globvar) list) (sfw: s_framework)
match successes with
| [] ->
sfw
- >>> sf_ef ^%= add_log (ERROR(
+ >>> sf_ef ^%=
+ add_log (ERROR(
"No matching data segment among candidates [" ^
(string_of_list
(fun ndx -> sfw.ef.elf.e_symtab.(ndx).st_name)
", "
ident_ndxes
) ^
- "]\nErrors:\n" ^
+ "], Errors: [" ^
string_of_list
- (fun x ->
- match x with
- | OK(_) -> ""
- | ERR(s) -> s ^ "\n"
- )
- ""
- results
+ (function OK(_) -> "" | ERR(s) -> s)
+ ", "
+ (List.filter (function ERR(_) -> true | _ -> false) results)
))
| [sfw] -> sfw
| fws ->
diff --git a/checklink/Fuzz.ml b/checklink/Fuzz.ml
index 9653834..7752aee 100644
--- a/checklink/Fuzz.ml
+++ b/checklink/Fuzz.ml
@@ -46,7 +46,7 @@ let fuzz_check elfmap bs byte old sdumps =
)
end
else (* not finding an ERROR is bad thus reported *)
- print_endline (fuzz_description ^ "DID NOT CAUSE AN ERROR!")
+ print_endline (fuzz_description ^ " DID NOT CAUSE AN ERROR!")
with
| Assert_failure(s, l, c) ->
if !fuzz_debug