Merge branch 'develop'

mass-0910 · Aug 22, 2022 · 94073e8 · 94073e8
2 parents 4f95b3b + 251621c
commit 94073e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/hsptest.hsp b/hsptest.hsp
@@ -219,14 +219,6 @@ if is_exist_option("--stdout") {
 spend_time = strf("%.2f", double(timeGetTime() - start_time) / 1000.0)
 
 mes ""
-if test_pass == 0 && test_fail == 0 {
-    centered_mes " no tests ran in " + spend_time + " seconds ", FOREGROUND_WHITE, "="
-} else : if test_fail == 0 {
-    centered_mes " all " + str(test_pass) + " passed in " + spend_time + " seconds ", FOREGROUND_GREEN, "="
-} else {
-    centered_mes " " + str(test_fail) + " failed, " + str(test_pass) + " passed in " + spend_time + " seconds ", FOREGROUND_RED, "="
-}
-
 if is_exist_option("--logfile") {
     init_logfile_module hspver_str, version, dir_cur
     logfile_path = get_option_arg("--logfile")
@@ -246,4 +238,12 @@ if is_exist_option("--logfile") {
     mes "output the log file to " + dir_cur + "\\" + logfile_path
 }
 
+if test_pass == 0 && test_fail == 0 {
+    centered_mes " no tests ran in " + spend_time + " seconds ", FOREGROUND_WHITE, "="
+} else : if test_fail == 0 {
+    centered_mes " all " + str(test_pass) + " passed in " + spend_time + " seconds ", FOREGROUND_GREEN, "="
+} else {
+    centered_mes " " + str(test_fail) + " failed, " + str(test_pass) + " passed in " + spend_time + " seconds ", FOREGROUND_RED, "="
+}
+
 end test_fail
diff --git a/parse_result.hsp b/parse_result.hsp
@@ -26,9 +26,9 @@ stdoutから結果をパースする
         error_message = result_match(0, 4)
     } else {
         result = "FAIL"
-        error_line = -1
+        error_line = "-1"
         error_file = "?"
-        error_message = "crash!!!"
+        error_message = "HSP3 runtime crashed!!!"
     }
     matches callstack_match, stdout, callstack_pattern, 1, 0, 0
     matched_num = stat