MacとLinux両方でコンパイルとテストが通るように

diff --git a/src/monitor.c b/src/monitor.c
index 8fd17b1cb79083c7a41801f75d44acc81be52118..b742486a5fb473b5b35e12b32684861577a4f086 100644 (file)
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <readline/readline.h>
+#include <readline/history.h>
 #include "monitor.h"
 #include "disassemble.h"
 

diff --git a/test/system/comet2monitor/break_help_2/0.txt b/test/system/comet2monitor/break_help_2/0.txt
index 8754ab73ced0428f2b0fd187e8681605f4e46652..97169d1a68d0a593571187089a95b7a9a71390b1 100644 (file)
--- a/test/system/comet2monitor/break_help_2/0.txt
+++ b/test/system/comet2monitor/break_help_2/0.txt
@@ -5,5 +5,4 @@ breakpoint manipulate:
     b[reak] d[el] <address>
     b[reak] l[ist]
     b[reak] r[eset]
-
 Info: arguments '1' are ignored.

diff --git a/test/system/comet2monitor/break_help_2/cmd b/test/system/comet2monitor/break_help_2/cmd
index aebf4d29ea1072ce873e941e8761dde5ba5331f0..dcbe06575594fceb92478dbd1c626594d9561d4a 100755 (executable)
--- a/test/system/comet2monitor/break_help_2/cmd
+++ b/test/system/comet2monitor/break_help_2/cmd
@@ -1 +1,2 @@
-../../../../comet2monitor <break_help_2.monitor 2>&1 | sed -e '/^(comet2 monitor) /d; /^Info/H; /^Info/d; $G'
+../../../../comet2monitor <break_help_2.monitor 2>tmp.log | sed -e '/^(comet2 monitor) /d' | cat - tmp.log && rm tmp.log
+

diff --git a/test/system/comet2monitor/dump_3/0.txt b/test/system/comet2monitor/dump_3/0.txt
index f0b74a7dcf2bbd8aa299058dfe2c1304ce08894c..f8069e320d972dbe88fc14d99d3cf71389d2b4c7 100644 (file)
--- a/test/system/comet2monitor/dump_3/0.txt
+++ b/test/system/comet2monitor/dump_3/0.txt
@@ -6,5 +6,4 @@ COMET II machine code monitor. Type ? for help.
 #0000: 0000: 7001 0000 7002 0000 3622 1010 0015 2621 2210 0017 4110 0016 6500 0010 6400 0007
 #0000: 0010: 1120 0018 7120 7110 8100 0001 000A 0001 0000 0000 0000 0000 0000 0000 0000 0000
 #0000: 0020: 0000
-
 Info: arguments '#40' are ignored.

diff --git a/test/system/comet2monitor/dump_3/cmd b/test/system/comet2monitor/dump_3/cmd
index bcad3261952b324d72ca8d123b08bf487d40e86b..67ed2e79eb52aa6eab3e30629e8c1d7978d7ff8e 100755 (executable)
--- a/test/system/comet2monitor/dump_3/cmd
+++ b/test/system/comet2monitor/dump_3/cmd
@@ -1 +1 @@
-../../../../comet2monitor <dump_3.monitor 2>&1 | sed -e '/^(comet2 monitor) /d; /^Info/H; /^Info/d; $G'
+../../../../comet2monitor <dump_3.monitor 2>tmp.log | sed -e '/^(comet2 monitor) /d' | cat - tmp.log && rm tmp.log