From bb78cb3ab859c63f11871b8bcd0f60c89744977c Mon Sep 17 00:00:00 2001 From: mass0910 Date: Mon, 22 Aug 2022 11:42:02 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E6=99=82=E3=81=AE=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parse_result.hsp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parse_result.hsp b/parse_result.hsp index 018eacd..8931dca 100644 --- 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 From 251621c91cf62b0177087e875252931ceb215ff9 Mon Sep 17 00:00:00 2001 From: mass0910 Date: Mon, 22 Aug 2022 12:48:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?testdir=E3=83=91=E3=82=B9=E3=81=AE=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hsptest.hsp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hsptest.hsp b/hsptest.hsp index 7757003..cf6a6ad 100644 --- 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 \ No newline at end of file