make valgrind用の修正

diff --git a/test/Template/Define.mk b/test/Template/Define.mk
index 74f4c33c1f7acfe99340685f2a54ce3bc41b32cd..590c3406d54df509c3a8425a4f433ce7113bf3d6 100644 (file)
--- a/test/Template/Define.mk
+++ b/test/Template/Define.mk
@@ -42,7 +42,7 @@ TIME := time
 TR := tr
 VALGRIND := valgrind
 VALGRIND_LOGFILE := _valgrind.log
-VALGRINDFLAG :=  -q --leak-check=full --show-leak-kinds=all --log-file=$(VALGRIND_LOGFILE)
+VALGRINDFLAG :=  -q --leak-check=full --show-leak-kinds=all --suppressions=../../readline.supp --log-file=$(VALGRIND_LOGFILE)
 VALGRIND_CMDLOGFILE := valgrind.log
 
 ######################################################################

diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
index 577ea2ab00507d2bf738e1046880e23a0d5f09db..738b0f820df48170d52e906aa1976060b95fab7c 100755 (executable)
--- a/test/system/comet2monitor/break_help_2/cmd
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -1,2 +1,2 @@
-../../../../comet2monitor -q <break_help_2.monitor 2>tmp.log | sed -e '/^(comet2 monitor) /d' | cat - tmp.log && rm tmp.log
+stdbuf -oL ../../../../comet2monitor -q <break_help_2.monitor 2>&1 | sed -e '/^(comet2 monitor) /d'
 

diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
index 8552850ca978cfc02bd816e696ab47f2b6faacea..5907faeae63c4a5979e1587d2b3f9a8af1d9b74e 100755 (executable)
--- a/test/system/comet2monitor/dump_3/cmd
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -1 +1 @@
-../../../../comet2monitor -q <dump_3.monitor 2>tmp.log | sed -e '/^(comet2 monitor) /d' | cat - tmp.log && rm tmp.log
+stdbuf -oL ../../../../comet2monitor -q <dump_3.monitor 2>&1 | sed -e '/^(comet2 monitor) /d'

diff --git a/test/system/readline.supp b/test/system/readline.supp
new file mode 100644 (file)
index 0000000..d33e583
--- /dev/null
+++ b/test/system/readline.supp
@@ -0,0 +1,35 @@
+{
+   readline_reachable_leak_generic
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:readline
+   ...
+}
+
+{
+   ncurses_reachable_leak_generic
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:tgetent_sp
+   ...
+}
+
+{
+   ncurses_setupterm_reachable_leak
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:_nc_setupterm
+   ...
+}
+
+{
+   gnu_history_reachable_leak
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:add_history
+   ...
+}
\ No newline at end of file