comet2monitor readline版のLinux対応

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

diff --git a/VERSION b/VERSION
index 504bbe6ac3953f6e6f3375f5c768850c488a307f..a4d9369ed3044d2acce84598ca05ede718468fff 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.5p40
+v0.5p41

diff --git a/src/monitor.c b/src/monitor.c
index 91ffab2a74ec10e2c4f4ce61927a42792c8dd948..1bdc37b00b66d1222091bf0712737404f8148547 100644 (file)
--- 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 5a6f8d6d96f828328de4715d8403d5a85629eee8..d143c7e480c9a5eedaae260676c4564943f5fdbf 100644 (file)
--- 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 2dc31190138007d81e6fc3176dc80487a7efbb2c..03c2c74b6cfd7dd986cce10b116a64348ac447aa 100755 (executable)
--- 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 f82d4fc2d72f9e25cf2731aec518a5525ac79002..7952f104e83626cd4387a7401198d065afaebf61 100755 (executable)
--- 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 26061c2be4811dabd23b2e22304c6113efa5edd5..ebf39626f4f6419870acda2e620cae4b99ec005b 100755 (executable)
--- 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 8618ea37304dbf13be33528038d17cf441114d09..1332752fa8dcc1bf797e442754e994d2f61443e1 100755 (executable)
--- 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 b88c014a71f1fc1189eaa16467248d70208e5262..f9b5d8653cf90d42832827d4c21f0146637ea9c3 100755 (executable)
--- 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 e2832b5f83778fc4aaa87bb31a0a488da276a42b..0734c47b4c7d0bca79d7deb3cd714d6de1631b05 100755 (executable)
--- 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 dd7280d24dd1dd914b9bba98108031e780601245..03978fcac406ad659a65cb32e55882054e1a845f 100755 (executable)
--- 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 e53b6c429a9b0124944d70cb900fbd79a2d6d605..f97c7db385a4eae7216934a89ffe13ff69c86a45 100755 (executable)
--- 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 6ec75073d20935906a12dc67b3eec68a0f7c4ddf..20bfaefd874d0c3e5d2802d1308f2f6d6b3abc78 100755 (executable)
--- 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 0dfb9be8e82937e1304e630d391f7df1f5bc28cf..76e0a2dd7dd59c963498f51e99651458ac6f6b88 100755 (executable)
--- 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 e8582009b86dbd3fcbd9f473e2925170bd856825..50ec073829d6297e6c4868176964fadf740eaf78 100755 (executable)
--- 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'