From e9fd60a2469ad26cc1f7b277a265f9ea34b0519d Mon Sep 17 00:00:00 2001 From: j8takagi Date: Thu, 25 Mar 2010 00:25:18 +0900 Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=8CMac=E3=82=84?= =?utf8?q?Cygwin=E3=81=AA=E3=81=A9=E3=81=A7=E3=82=82=E6=88=90=E5=8A=9F?= =?utf8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- test/integration/casl2/TEST.mk | 2 +- test/integration/casl2/TEST_O.mk | 2 +- test/integration/casl2/err_126/0.txt | 2 ++ test/integration/casl2/err_126/Makefile | 3 +++ test/integration/casl2/opt_opterr/0.txt | 4 +--- test/integration/casl2/opt_opterr/Makefile | 2 ++ 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 test/integration/casl2/err_126/0.txt create mode 100644 test/integration/casl2/err_126/Makefile diff --git a/test/integration/casl2/TEST.mk b/test/integration/casl2/TEST.mk index 13e4f02..ed67014 100644 --- a/test/integration/casl2/TEST.mk +++ b/test/integration/casl2/TEST.mk @@ -14,7 +14,7 @@ clean: @rm -f 1.txt diff.txt report.txt err.txt cleanall: clean @rm -f 0.txt -0.txt 1.txt: $(CASL2) $(ASFILE) +0.txt 1.txt:: $(CASL2) $(ASFILE) @echo $(CMD) >$@; \ $(CMD) >>$@ 2>$(ERRFILE); \ if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi diff --git a/test/integration/casl2/TEST_O.mk b/test/integration/casl2/TEST_O.mk index 2d16d49..b448d40 100644 --- a/test/integration/casl2/TEST_O.mk +++ b/test/integration/casl2/TEST_O.mk @@ -25,7 +25,7 @@ cleanall: clean $(OD) >>$@ 2>>$(ERRFILE); \ if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi diff.txt: 1.txt - @-diff 0.txt 1.txt >$@ 2>&1 + @-diff -b 0.txt 1.txt >$@ 2>&1 report.txt: diff.txt @echo -n "$(UNITNAME): Test " >$@; \ if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \ diff --git a/test/integration/casl2/err_126/0.txt b/test/integration/casl2/err_126/0.txt new file mode 100644 index 0000000..667a371 --- /dev/null +++ b/test/integration/casl2/err_126/0.txt @@ -0,0 +1,2 @@ +../../../../casl2 +CASL2 error - 126: no source file diff --git a/test/integration/casl2/err_126/Makefile b/test/integration/casl2/err_126/Makefile new file mode 100644 index 0000000..43e8194 --- /dev/null +++ b/test/integration/casl2/err_126/Makefile @@ -0,0 +1,3 @@ +include ../CMD.mk # YACASL2DIR, CASL2 +CMD = $(CASL2) +include ../TEST.mk diff --git a/test/integration/casl2/opt_opterr/0.txt b/test/integration/casl2/opt_opterr/0.txt index 890f3b0..335b97e 100644 --- a/test/integration/casl2/opt_opterr/0.txt +++ b/test/integration/casl2/opt_opterr/0.txt @@ -1,3 +1 @@ -../../../../casl2 -z ../../../../as/sum_10.casl -../../../../casl2: invalid option -- z -Usage: ../../../../casl2 [-slLaAtTdh] [-oO] [-M ] [-C ] FILE ... +Usage: ../../../../casl2 [-slLaAtTdh] [-oO[]] [-M ] [-C ] FILE1[ FILE2 ...] diff --git a/test/integration/casl2/opt_opterr/Makefile b/test/integration/casl2/opt_opterr/Makefile index 76a17fb..5d0a565 100644 --- a/test/integration/casl2/opt_opterr/Makefile +++ b/test/integration/casl2/opt_opterr/Makefile @@ -4,3 +4,5 @@ include ../opt_s/CMD.mk # ASDIR, ASFILE CASL2FLAG = -z CMD = $(CASL2) $(CASL2FLAG) $(ASFILE) include ../TEST.mk +0.txt 1.txt:: $(CASL2) $(ASFILE) + @if test -s $(ERRFILE); then tail -1 err.txt >$@; else rm -f $(ERRFILE); fi -- 2.18.0