- Changed make run-tests to use the testrunner.clv

Author: felipensp

CMakeLists.txt

@@ -219,9 +219,9 @@ endif()
 
 # Test runner
 # ---------------------------------------------------------------------------
-set(TEST_RUNNER_BIN ${CMAKE_BINARY_DIR}/testrunner${CMAKE_EXECUTABLE_SUFFIX})
+set(TEST_RUNNER_BIN ${CMAKE_BINARY_DIR}/clever extra/testrunner.clv)
 add_custom_target(run-tests
-	COMMAND ${TEST_RUNNER_BIN} -q;${CMAKE_CURRENT_SOURCE_DIR}/tests
+	COMMAND ${TEST_RUNNER_BIN}
 	COMMENT "Running tests")
 add_dependencies(run-tests clever-cli)
 add_dependencies(run-tests testrunner)

extra/testrunner.clv

@@ -45,9 +45,6 @@ function runtest(file) {
 		var title = title_re.group(0) + " (" + file + ")";
 		var code_re = regex:Regex.new("==CODE==\s*((?s:(?!==RESULT==).)+)");
 
-		io:print("\r[....] " + title);
-		io:flush();
-
 		if (code_re.match(content)) {
 			var status;
 			var ts1 = sys:microtime();
@@ -60,19 +57,18 @@ function runtest(file) {
 			var result_re2 = regex:Regex.new(result_re.group(1).trim());
 
 			if (result_re2.test(result)) {
-				status = "PASS";
 				++passed;
 
 				file:remove(file + ".tmp");
 				file:remove(file + ".tmp.out");
 			} else {
 				status = "FAIL";
 				++failed;
+				
+				io:println("\r[" + status + "] " + title + " - " + (ts2 - ts1) + " ms");
 			}
 
 			time_taken += (ts2 - ts1);
-
-			io:println("\r[" + status + "] " + title + " - " + (ts2 - ts1) + " ms");
 		} else {
 			io:println("Error: malformed test detected!");
 			sys:exit(1);
@@ -99,6 +95,6 @@ if (passed > 0 || failed > 0) {
 	io:println("Passed tests: " + passed);
 	io:println("Failed tests: " + failed);
 	io:println("-----------------------------------");
-	io:println("Time taken: " + time_taken);
+	io:println("Time taken: " + time_taken + " ms");
 	io:println("-----------------------------------");
 }