From: j8takagi <j8takagi@nifty.com>
Date: Wed, 3 Jun 2026 14:20:17 +0000 (+0900)
Subject: comet2monitor readline版のLinux対応
X-Git-Tag: v0.5p41
X-Git-Url: https://j8takagi.net/gitweb?a=commitdiff_plain;h=882107f713ff0eaf498be5b737a86c262dfcc897;p=yacasl2.git

comet2monitor readline版のLinux対応

プロンプトと入力がMacではstderr、Linuxではstdoutに出力される
Linuxではstdio.hのインクルードが必要
テストを修正
ついでに、make check時の誤字の修正
---

diff --git a/VERSION b/VERSION
index 504bbe6..a4d9369 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p40
+v0.5p41
diff --git a/src/monitor.c b/src/monitor.c
index 91ffab2..1bdc37b 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #include "monitor.h"
diff --git a/test/Template/Group.mk b/test/Template/Group.mk
index 5a6f8d6..d143c7e 100644
--- a/test/Template/Group.mk
+++ b/test/Template/Group.mk
@@ -87,7 +87,7 @@ TEST_VALGRIND_FILES := $(foreach test,$(TESTS),$(test)/$(VALGRIND_FILE))
 # 用例: $(call group_report,name,file_log,file_report)
 define group_report
     $(ECHO) '$1: $(SUCCESS_TEST) / $(ALL_TEST) tests passed. Details in $(GROUP_DIR)/$2' >$3
-    if $(TEST) $(FAIL_TEST) -eq 0; then $(ECHO) "$1: All tests are succeded." >>$3; fi
+    if $(TEST) $(FAIL_TEST) -eq 0; then $(ECHO) "$1: All tests are succeeded." >>$3; fi
 endef
 
 # リストで指定したディレクトリーでmakeを実行
diff --git a/test/system/comet2monitor/break_help/cmd b/test/system/comet2monitor/break_help/cmd
index 2dc3119..03c2c74 100755
--- a/test/system/comet2monitor/break_help/cmd
+++ b/test/system/comet2monitor/break_help/cmd
@@ -1 +1 @@
-../../../../comet2monitor <break_help.monitor
+../../../../comet2monitor <break_help.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
index f82d4fc..7952f10 100755
--- a/test/system/comet2monitor/break_help_2/cmd
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -1 +1 @@
-../../../../comet2monitor <break_help_2.monitor
+../../../../comet2monitor <break_help_2.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/dump_0/cmd b/test/system/comet2monitor/dump_0/cmd
index 26061c2..ebf3962 100755
--- a/test/system/comet2monitor/dump_0/cmd
+++ b/test/system/comet2monitor/dump_0/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_0.monitor
+../../../../comet2monitor <dump_0.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/dump_1/cmd b/test/system/comet2monitor/dump_1/cmd
index 8618ea3..1332752 100755
--- a/test/system/comet2monitor/dump_1/cmd
+++ b/test/system/comet2monitor/dump_1/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_1.monitor
+../../../../comet2monitor <dump_1.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/dump_2/cmd b/test/system/comet2monitor/dump_2/cmd
index b88c014..f9b5d86 100755
--- a/test/system/comet2monitor/dump_2/cmd
+++ b/test/system/comet2monitor/dump_2/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_2.monitor
+../../../../comet2monitor <dump_2.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
index e2832b5..0734c47 100755
--- a/test/system/comet2monitor/dump_3/cmd
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_3.monitor
+../../../../comet2monitor <dump_3.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/dump_plus/cmd b/test/system/comet2monitor/dump_plus/cmd
index dd7280d..03978fc 100755
--- a/test/system/comet2monitor/dump_plus/cmd
+++ b/test/system/comet2monitor/dump_plus/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_plus.monitor
+../../../../comet2monitor <dump_plus.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/help/cmd b/test/system/comet2monitor/help/cmd
index e53b6c4..f97c7db 100755
--- a/test/system/comet2monitor/help/cmd
+++ b/test/system/comet2monitor/help/cmd
@@ -1 +1 @@
-../../../../comet2monitor <help.monitor
+../../../../comet2monitor <help.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/load/cmd b/test/system/comet2monitor/load/cmd
index 6ec7507..20bfaef 100755
--- a/test/system/comet2monitor/load/cmd
+++ b/test/system/comet2monitor/load/cmd
@@ -1 +1 @@
-../../../../comet2monitor <load.monitor
+../../../../comet2monitor <load.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/quit/cmd b/test/system/comet2monitor/quit/cmd
index 0dfb9be..76e0a2d 100755
--- a/test/system/comet2monitor/quit/cmd
+++ b/test/system/comet2monitor/quit/cmd
@@ -1 +1 @@
-../../../../comet2monitor <quit.monitor
+../../../../comet2monitor <quit.monitor | sed '/^(comet2 monitor) /d'
diff --git a/test/system/comet2monitor/revert_hello/cmd b/test/system/comet2monitor/revert_hello/cmd
index e858200..50ec073 100755
--- a/test/system/comet2monitor/revert_hello/cmd
+++ b/test/system/comet2monitor/revert_hello/cmd
@@ -1 +1 @@
-../../../../comet2monitor <revert_hello.monitor
+../../../../comet2monitor <revert_hello.monitor | sed '/^(comet2 monitor) /d'