From: j8takagi <j8takagi@nifty.com>
Date: Sat, 5 Mar 2011 04:03:43 +0000 (+0900)
Subject: システムテストを修正
X-Git-Tag: v0.1p22
X-Git-Url: https://j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18a010c76044e83fd3bbb00bad2c3c32ace8eee5;p=YACASL2.git

システムテストを修正
---

diff --git a/test/system/casl2/Test.mk b/test/system/casl2/Test.mk
index 11d4065..ac0fbb7 100644
--- a/test/system/casl2/Test.mk
+++ b/test/system/casl2/Test.mk
@@ -49,7 +49,7 @@ define exec_cmd
     if test ! -x $1; then $(CHMOD) u+x $1; fi
     ./$1 >>$2 2>$3
     if test -s $3; then $(CAT) $3 >>$2; fi
-    $(SED) -i '' -e "s%$(CURRDIR)%\$$PWD%g" $2
+    $(CP) $2 $2.tmp && $(SED) -e "s%$(CURRDIR)%\$$PWD%g" $2.tmp >$2 && $(RM) $2.tmp
     $(call rm_null,$3)
 endef
 
diff --git a/test/system/comet2/Test.mk b/test/system/comet2/Test.mk
index 11d4065..ac0fbb7 100644
--- a/test/system/comet2/Test.mk
+++ b/test/system/comet2/Test.mk
@@ -49,7 +49,7 @@ define exec_cmd
     if test ! -x $1; then $(CHMOD) u+x $1; fi
     ./$1 >>$2 2>$3
     if test -s $3; then $(CAT) $3 >>$2; fi
-    $(SED) -i '' -e "s%$(CURRDIR)%\$$PWD%g" $2
+    $(CP) $2 $2.tmp && $(SED) -e "s%$(CURRDIR)%\$$PWD%g" $2.tmp >$2 && $(RM) $2.tmp
     $(call rm_null,$3)
 endef
 
diff --git a/test/system/comet2/opt_opterr/0.txt b/test/system/comet2/opt_opterr/0.txt
index 68ca826..b4b0041 100644
--- a/test/system/comet2/opt_opterr/0.txt
+++ b/test/system/comet2/opt_opterr/0.txt
@@ -1,2 +1 @@
-comet2: invalid option -- z
 Usage: ../../../../comet2 [-tTdh] [-M <MEMORYSIZE>] [-C <CLOCKS>] FILE
diff --git a/test/system/comet2/opt_opterr/cmd b/test/system/comet2/opt_opterr/cmd
index 6b9a889..4ba1f06 100755
--- a/test/system/comet2/opt_opterr/cmd
+++ b/test/system/comet2/opt_opterr/cmd
@@ -1,3 +1,3 @@
 ../../../../casl2 -O ../../../../as/sum_10.casl
-../../../../comet2 -z a.o 2>&1
+../../../../comet2 -z a.o 2>&1 | tail -1 1>&2
 rm -f a.o
diff --git a/test/system/dumpword/Test.mk b/test/system/dumpword/Test.mk
index 11d4065..ac0fbb7 100644
--- a/test/system/dumpword/Test.mk
+++ b/test/system/dumpword/Test.mk
@@ -49,7 +49,7 @@ define exec_cmd
     if test ! -x $1; then $(CHMOD) u+x $1; fi
     ./$1 >>$2 2>$3
     if test -s $3; then $(CAT) $3 >>$2; fi
-    $(SED) -i '' -e "s%$(CURRDIR)%\$$PWD%g" $2
+    $(CP) $2 $2.tmp && $(SED) -e "s%$(CURRDIR)%\$$PWD%g" $2.tmp >$2 && $(RM) $2.tmp
     $(call rm_null,$3)
 endef