X-Git-Url: http://nitlanguage.org

diff --git a/src/testing/testing_doc.nit b/src/testing/testing_doc.nit
index cfaa912..7419c9f 100644
--- a/src/testing/testing_doc.nit
+++ b/src/testing/testing_doc.nit
@@ -36,8 +36,8 @@ class NitUnitExecutor
 	# The XML node associated to the module
 	var testsuite: HTMLTag
 
-	# All failures from a same `ADoc`
-	var failures = new Array[String]
+	# The name of the suite
+	var name: String
 
 	# Markdown processor used to parse markdown comments and extract code.
 	var mdproc = new MarkdownProcessor
@@ -66,7 +66,6 @@ class NitUnitExecutor
 	fun extract(mdoc: MDoc, xml_classname, xml_name: String)
 	do
 		last_docunit = null
-		failures.clear
 		self.xml_classname = xml_classname
 		self.xml_name = xml_name
 
@@ -74,29 +73,27 @@ class NitUnitExecutor
 
 		# Populate `blocks` from the markdown decorator
 		mdproc.process(mdoc.content.join("\n"))
-
-		toolcontext.check_errors
-
-		if not failures.is_empty then
-			for msg in failures do
-				var ne = new HTMLTag("failure")
-				ne.attr("message", msg)
-				tc.add ne
-				toolcontext.modelbuilder.unit_entities += 1
-				toolcontext.modelbuilder.failed_entities += 1
-			end
-			if last_docunit == null then testsuite.add(tc)
-		end
 	end
 
 	# All extracted docunits
 	var docunits = new Array[DocUnit]
 
+	fun mark_done(du: DocUnit)
+	do
+		du.is_done = true
+	end
+
 	# Execute all the docunits
 	fun run_tests
 	do
 		var simple_du = new Array[DocUnit]
 		for du in docunits do
+			# Skip existing errors
+			if du.error != null then
+				mark_done(du)
+				continue
+			end
+
 			var ast = toolcontext.parse_something(du.block)
 			if ast isa AExpr then
 				simple_du.add du
@@ -108,6 +105,10 @@ class NitUnitExecutor
 		test_simple_docunits(simple_du)
 
 		for du in docunits do
+			print du.to_screen
+		end
+
+		for du in docunits do
 			testsuite.add du.to_xml
 		end
 	end
@@ -161,16 +162,16 @@ class NitUnitExecutor
 			i += 1
 			toolcontext.info("Execute doc-unit {du.full_name} in {file} {i}", 1)
 			var res2 = toolcontext.safe_exec("{file.to_program_name}.bin {i} >'{file}.out1' 2>&1 </dev/null")
+			du.was_exec = true
 
 			var content = "{file}.out1".to_path.read_all
-			var msg = content.trunc(8192).filter_nonprintable
+			du.raw_output = content
 
 			if res2 != 0 then
-				du.error = content
-				toolcontext.warning(du.location, "error", "ERROR: {du.full_name} (in {file}): Runtime error\n{msg}")
+				du.error = "Runtime error in {file} with argument {i}"
 				toolcontext.modelbuilder.failed_entities += 1
 			end
-			toolcontext.check_errors
+			mark_done(du)
 		end
 	end
 
@@ -194,20 +195,20 @@ class NitUnitExecutor
 		var res2 = 0
 		if res == 0 then
 			res2 = toolcontext.safe_exec("{file.to_program_name}.bin >'{file}.out1' 2>&1 </dev/null")
+			du.was_exec = true
 		end
 
 		var content = "{file}.out1".to_path.read_all
-		var msg = content.trunc(8192).filter_nonprintable
+		du.raw_output = content
 
 		if res != 0 then
-			du.error = content
-			toolcontext.warning(du.location, "failure", "FAILURE: {du.full_name} (in {file}):\n{msg}")
+			du.error = "Compilation error in {file}"
 			toolcontext.modelbuilder.failed_entities += 1
 		else if res2 != 0 then
-			toolcontext.warning(du.location, "error", "ERROR: {du.full_name} (in {file}):\n{msg}")
+			du.error = "Runtime error in {file}"
 			toolcontext.modelbuilder.failed_entities += 1
 		end
-		toolcontext.check_errors
+		mark_done(du)
 	end
 
 	# Create and fill the header of a unit file `file`.
@@ -299,8 +300,11 @@ private class NitunitDecorator
 				message = "Error: Invalid Nit code."
 			end
 
-			executor.toolcontext.warning(location, "invalid-block", "{message} To suppress this message, enclose the block with a fence tagged `nitish` or `raw` (see `man nitdoc`).")
-			executor.failures.add("{location}: {message}")
+			var du = new_docunit
+			du.block += code
+			du.error_location = location
+			du.error = message
+			executor.toolcontext.modelbuilder.failed_entities += 1
 			return
 		end
 
@@ -358,11 +362,13 @@ class DocUnit
 	# The numbering of self in mdoc (starting with 0)
 	var number: Int
 
-	# The name of the unit to show in messages
-	fun full_name: String do
+	redef fun full_name do
 		var mentity = mdoc.original_mentity
-		if mentity != null then return mentity.full_name
-		return xml_classname + "." + xml_name
+		if mentity != null then
+			return mentity.full_name
+		else
+			return xml_classname + "." + xml_name
+		end
 	end
 
 	# The text of the code to execute.
@@ -384,7 +390,7 @@ class DocUnit
 	#
 	# If `self` is made of multiple code-blocks, then the location
 	# starts at the first code-books and finish at the last one, thus includes anything between.
-	var location: Location is lazy do
+	redef var location is lazy do
 		return new Location(mdoc.location.file, lines.first, lines.last+1, columns.first+1, 0)
 	end
 
@@ -450,7 +456,7 @@ redef class ModelBuilder
 
 		var prefix = toolcontext.test_dir
 		prefix = prefix.join_path(mmodule.to_s)
-		var d2m = new NitUnitExecutor(toolcontext, prefix, o, ts)
+		var d2m = new NitUnitExecutor(toolcontext, prefix, o, ts, "Docunits of module {mmodule.full_name}")
 
 		do
 			total_entities += 1
@@ -504,7 +510,7 @@ redef class ModelBuilder
 
 		var prefix = toolcontext.test_dir
 		prefix = prefix.join_path(mgroup.to_s)
-		var d2m = new NitUnitExecutor(toolcontext, prefix, o, ts)
+		var d2m = new NitUnitExecutor(toolcontext, prefix, o, ts, "Docunits of group {mgroup.full_name}")
 
 		total_entities += 1
 		var mdoc = mgroup.mdoc
@@ -530,7 +536,7 @@ redef class ModelBuilder
 		ts.attr("package", file)
 
 		var prefix = toolcontext.test_dir / "file"
-		var d2m = new NitUnitExecutor(toolcontext, prefix, null, ts)
+		var d2m = new NitUnitExecutor(toolcontext, prefix, null, ts, "Docunits of file {file}")
 
 		total_entities += 1
 		doc_entities += 1