read rest of child output, also if child exists with error

cleantest.icl

@@ -289,7 +289,7 @@ where
 		= return event r io w
 	# rcode = fromOk t
 	// Check return code
-	| rcode == Just 0
+	| isJust rcode
 		# (_,output,io,w) = readPipes output pio io w
 		# results = map (fromJSON o fromString) $ filter ((<>) "") output.lines
 		| any isNothing results
@@ -302,16 +302,16 @@ where
 			= return event r io w
 		# ee = mergeResults $ map fromJust results
 		# io = emit (EndEvent ee) io
+		| fromJust rcode <> 0
+			# event = Failed Nothing
+			# io = emit ( EndEvent  { name    = r.TestRun.name
+			                        , event   = event
+			                        , message = "Child process exited with " <+ fromJust rcode
+			                        }
+			            )
+			            io
+			= return event r io w
 		= return ee.event r io w
-	| isJust rcode
-		# (_,output,io,w) = readPipes output pio io w
-		# event = Failed Nothing
-		# io = emit (EndEvent
-			{ name    = r.TestRun.name
-			, event   = event
-			, message = "Child process exited with " <+ fromJust rcode
-			}) io
-		= return event r io w
 	# w = snd $ fclose io w
 	= redirect output h pio r w
 	where