From: j8takagi Date: Sun, 19 Dec 2010 15:20:15 +0000 (+0900) Subject: CASL2LIBの状態が不正になっていたのを修正 X-Git-Tag: v0.1p15~13^2~1 X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=commitdiff_plain;h=55d1da968d999e33238da299f933c70d95bcc66c CASL2LIBの状態が不正になっていたのを修正 --- diff --git a/as/casl2lib/.gitignore b/as/casl2lib/.gitignore deleted file mode 100644 index 8971ef6..0000000 --- a/as/casl2lib/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -inl.casl -l2str.casl -mula.casl -outa.casl -outb.casl -outl.casl -str2l.casl diff --git a/as/casl2lib/Makefile b/as/casl2lib/Makefile deleted file mode 100644 index 89b2073..0000000 --- a/as/casl2lib/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -ECHOHEADER = 'echo ";;; *** This file is auto generated. ***"' -TARGETS = diva.casl inl.casl l2str.casl mula.casl outa.casl outb.casl outl.casl -.PHONY: all clean -all: $(TARGETS) -diva.casl: src_diva/diva_main.casl divl.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -inl.casl: src_inl/inl_main.casl str2l.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -l2str.casl: src_l2str/l2str_main.casl divl.casl rev.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -mula.casl: src_mula/mula_main.casl mull.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -outa.casl: src_outa/outa_main.casl divl.casl rev.casl abs.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -outb.casl: src_outb/outb_main.casl divl.casl rev.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -outl.casl: src_outl/outl_main.casl l2str.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -str2l.casl: src_str2l/str2l_main.casl mull.casl - @echo ";;; *** This file is auto generated. ***" >$@; \ - cat $^ >>$@ -clean: - @for target in $(TARGETS); do rm -f $$target; done diff --git a/as/casl2lib/inl.casl b/as/casl2lib/inl.casl new file mode 100644 index 0000000..3587131 --- /dev/null +++ b/as/casl2lib/inl.casl @@ -0,0 +1,22 @@ +;;; 0から65535の範囲にある整数の入力を受け付ける +;;; 入力 （SVC） +;;; 出力 GR1: 入力された数値 +;;; GR0: 文字列の長さ。入力が数字以外の場合は、#FFFF +;;; 65536以上の正数が入力された場合はエラー +INL START + IN IBUF,ILEN ; 入力文字列を格納 + LAD GR1,IBUF + LD GR2,ILEN + CPA GR2,LENMAX + JPL LENOV + CALL STR2L + JOV FIN + LD GR0,GR2 + JUMP FIN +LENOV LAD GR0,#FFFF + SRA GR0,1 +FIN RET +ILEN DS 1 +LENMAX DC 5 +IBUF DS 5 + END diff --git a/as/casl2lib/l2str.casl b/as/casl2lib/l2str.casl new file mode 100644 index 0000000..3623c72 --- /dev/null +++ b/as/casl2lib/l2str.casl @@ -0,0 +1,45 @@ +;;; 数値を10進数の整数を表す文字列として格納 +;;; 入力 GR1: 数値（0〜65535） GR2: 文字列を格納するアドレス +;;; 出力 GR0: 文字列の長さ +L2STR START + PUSH 0,GR1 + PUSH 0,GR3 + PUSH 0,GR4 + LAD GR2,10 ; GR2に10進数の「10」を格納。 + LAD GR0,0 ; GR0 <- 0 + LD GR4,GR2 ; GR4 <- GR2 + AND GR1,GR1 ; GR1をテスト + JZE ZERO ; GR1が0の場合、ZEROにジャンプ + PUSH 0,GR2 ; GR2を退避 + LAD GR2,BASE ; GR2 <- BASE:基数10 +STI CPL GR1,GR2 ; ループ先頭。(GR1 < GR2)の場合は、ループ脱出 + JMI STLST ; ↓ + CALL DIVL ; GR1とGR2の、商をGR0、剰余をGR3に格納 + LD GR1,GR3 ; GR1にGR3をコピー + LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,0,GR4 ; GR4のアドレス <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + LD GR1,GR0 ; GR1 <- GR0:商 + JUMP STI ; ループ終端 +STLST LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,0,GR4 ; GR4のアドレス <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + POP GR2 ; GR2を復元 + SUBL GR4,GR2 ; GR4 <- (GR4 - GR2):文字列の長さ + JUMP RV ; RVへジャンプ +ZERO LD GR1,NCHAR ; 「0」をSTR領域に格納 + ST GR1,0,GR4 ; ↓ GR4のアドレス <- GR1 + LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 +RV LD GR1,GR2 ; 文字列を逆順に並べ替え + LD GR2,GR4 ; ↓ + CALL REV ; ↓ +FIN LD GR0,GR2 ; GR0 <- GR2 + LD GR2,GR1 ; GR2 <- GR1 + POP GR4 + POP GR3 + POP GR1 + RET +BASE DC 10 +LEN DS 1 +NCHAR DC '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' + END diff --git a/as/casl2lib/mula.casl b/as/casl2lib/mula.casl new file mode 100644 index 0000000..431486a --- /dev/null +++ b/as/casl2lib/mula.casl @@ -0,0 +1,41 @@ +;;; -32767〜32767の範囲にある正数のかけ算（筆算方式）を行う +;;; 入力 GR1:被乗数 GR2:乗数 +;;; 出力 GR0:積 +;;; 被乗数または乗数が-32768の場合は、オーバーフロー +;;; 積が-32767未満または32767より大きい場合は、GR0は積の下位16ビットになり、オーバーフロー +MULA START + RPUSH + XOR GR0,GR0 ; 積 + AND GR1,GR1 ; (GR1 = 0)の場合、終了 + JZE FIN ; ↓ + AND GR2,GR2 ; (GR2 = 0)の場合、終了 + JZE FIN ; ↓ + LAD GR3,1 ; 対象ビット + XOR GR4,GR4 ; マイナスフラグ +CHK1 AND GR1,GR1 ; (GR1 > 0)の場合は、CHK2へジャンプ + JPL CHK2 ; ↓ + XOR GR1,ALLON ; GR1の正負を反転 + ADDA GR1,ONE ; ↓ + JOV FIN ; (GR1 = -32768)の場合は終了 + XOR GR4,ONE ; GR4 <- 1 +CHK2 AND GR2,GR2 ; (GR1 > 0)の場合は、LOOPへジャンプ + JPL MUL ; ↓ + XOR GR2,ALLON ; GR2の正負を反転 + ADDA GR2,ONE ; ↓ + JOV FIN ; (GR2 = -32768)の場合は終了 + XOR GR4,ONE ; マイナスフラグを反転 +MUL CALL MULL ; GR0 <- GR1 * GR2 + JOV FIN + AND GR0,GR0 + JMI OV +MIN AND GR4,GR4 ; マイナスフラグがオフの場合、終了 + JZE FIN ; ↓ + XOR GR0,ALLON ; GR1の正負を反転 + ADDA GR0,ONE ; ↓ + JUMP FIN +OV ADDL GR0,=#8000 +FIN RPOP + RET +ONE DC 1 +ALLON DC #FFFF + END diff --git a/as/casl2lib/outa.casl b/as/casl2lib/outa.casl new file mode 100644 index 0000000..6f8f84d --- /dev/null +++ b/as/casl2lib/outa.casl @@ -0,0 +1,44 @@ +;;; GR1に格納された値を、10進数の整数値（-32768〜32767）として表示 +OUTA START + RPUSH + LAD GR2,10 ; GR2に10進数の「10」を格納。 + LAD GR0,0 ; GR0 <- 0 + LAD GR4,0 ; 負数フラグ。GR1が負数の場合、GR4は1 + LAD GR5,0 ; 整数値の長さ + AND GR1,GR1 ; GR1をテスト + JZE ZPRT ; GR1が0の場合、ZPRTにジャンプ + JPL STI ; GR1が正数の場合、STIにジャンプ + LAD GR4,1 ; GR1が負数の場合、GR4をオン + CALL ABS ; GR1を正数に変換 +STI CPL GR1,GR2 ; ループ先頭。(GR1 < GR2)の場合は、ループ脱出 + JMI STLST ; ↓ + CALL DIVL ; GR1とGR2の、商をGR0、剰余をGR3に格納 + LD GR1,GR3 ; GR1にGR3をコピー + LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR5 ; (STR + GR5) <- GR1 + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 + LD GR1,GR0 ; GR0をGR1にコピー + JUMP STI ; ループ終端 +STLST LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR5 ; (STR + GR5) <- GR1 + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 + AND GR4,GR4 ; 正数の場合 + JZE PRT ; ↓ + LD GR1,='-' ; 負数の場合、「-」をSTR領域に格納 + ST GR1,STR,GR5 ; (STR + GR5) <- GR1 + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 + JUMP PRT ; PRTにジャンプ +ZPRT LD GR1,NCHAR ; 「0」をSTR領域に格納 + ST GR1,STR,GR5 ; (STR + GR5) <- GR1 + LAD GR5,1,GR5 ; GR5 <- GR5 + 1 +PRT ST GR5,LEN ; LEN <- GR5 + LD GR2,LEN ; GR2にLENの値を格納 + LAD GR1,STR ; GR1に文字列のアドレスを格納 + CALL REV ; 文字列を逆順に並べ替え + OUT STR,LEN ; 文字列を出力 + RPOP + RET +STR DS 17 +LEN DS 1 +NCHAR DC '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' + END diff --git a/as/casl2lib/outb.casl b/as/casl2lib/outb.casl new file mode 100644 index 0000000..91ee4fa --- /dev/null +++ b/as/casl2lib/outb.casl @@ -0,0 +1,42 @@ +;;; GR1に格納された値を、2進数値として表示 +OUTB START + RPUSH + LAD GR2,2 ; GR2に2進数の「2」を格納。 + LAD GR0,0 ; GR0 <- 0 + XOR GR4,GR4 ; 2進数値の長さ + AND GR1,GR1 ; GR1をテスト + JZE ZERO ; GR1が0の場合、ZEROにジャンプ +STI CPL GR1,GR2 ; ループ先頭。(GR1 < GR2)の場合は、ループ脱出 + JMI STLST ; ↓ + CALL DIVL ; GR1とGR2の、商をGR0、剰余をGR3に格納 + LD GR1,GR3 ; GR1にGR3をコピー + LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR4 ; (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + LD GR1,GR0 ; GR0をGR1にコピー + JUMP STI ; ループ終端 +STLST LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR4 ; (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + JUMP EMB ; EMBにジャンプ +ZERO LD GR1,NCHAR ; 「0」をSTR領域に格納 + ST GR1,STR,GR4 ; ↓ (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 +EMB LD GR1,NCHAR ; GR1 <- '0' +EMLOOP CPA GR4,DIG ; ループ先頭。(GR4 = DIG)の場合は、ループ脱出 + JZE PRT ; ↓ + ST GR1,STR,GR4 ; ↓ (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 + JUMP EMLOOP ; ループ終端 +PRT ST GR4,LEN ; LEN <- GR4 + LD GR2,LEN ; GR2にLENの値を格納 + LAD GR1,STR ; GR1に文字列のアドレスを格納 + CALL REV ; 文字列を逆順に並べ替え + OUT STR,LEN ; 文字列を出力 + RPOP + RET +STR DS 17 +LEN DS 1 +NCHAR DC '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' +DIG DC 16 + END diff --git a/as/casl2lib/outl.casl b/as/casl2lib/outl.casl new file mode 100644 index 0000000..a2967d8 --- /dev/null +++ b/as/casl2lib/outl.casl @@ -0,0 +1,36 @@ +;;; GR1に格納された値を、10進数の整数値（0〜65535）として表示 +;;; 依存プログラム: DIVL, REV +OUTL START + RPUSH + LAD GR2,10 ; GR2に10進数の「10」を格納。 + LAD GR0,0 ; GR0 <- 0 + XOR GR4,GR4 ; 整数値の長さ + AND GR1,GR1 ; GR1をテスト + JZE ZERO ; GR1が0の場合、ZEROにジャンプ +STI CPL GR1,GR2 ; ループ先頭。(GR1 < GR2)の場合は、ループ脱出 + JMI STLST ; ↓ + CALL DIVL ; GR1とGR2の、商をGR0、剰余をGR3に格納 + LD GR1,GR3 ; GR1にGR3をコピー + LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR4 ; (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + LD GR1,GR0 ; GR0をGR1にコピー + JUMP STI ; ループ終端 +STLST LD GR1,NCHAR,GR1 ; GR1を文字に変換 + ST GR1,STR,GR4 ; (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + JUMP PRT ; PRTにジャンプ +ZERO LD GR1,NCHAR ; 「0」をSTR領域に格納 + ST GR1,STR,GR4 ; ↓ (STR + GR4) <- GR1 + LAD GR4,1,GR4 ; ↓ GR4 <- GR4 + 1 +PRT ST GR4,LEN ; LEN <- GR4 + LD GR2,LEN ; GR2にLENの値を格納 + LAD GR1,STR ; GR1に文字列のアドレスを格納 + CALL REV ; 文字列を逆順に並べ替え + OUT STR,LEN ; 文字列を出力 + RPOP + RET +STR DS 17 ; 符号付き2進数で表記した場合を想定 +LEN DS 1 +NCHAR DC '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' + END diff --git a/as/casl2lib/str2l.casl b/as/casl2lib/str2l.casl new file mode 100644 index 0000000..95791f3 --- /dev/null +++ b/as/casl2lib/str2l.casl @@ -0,0 +1,94 @@ +;;; *** This file is auto generated. *** +;;; 0〜65535の範囲にある整数の入力を受け付ける +;;; 10進数の整数を表す文字列を数値に変換 +;;; 入力 GR1: 文字列を格納するアドレス +;;; GR2: 文字列の長さ。1-5を想定 +;;; 出力 GR0: 数値（0〜65535） +;;; 文字列が長過ぎる場合や数値以外の場合は、GR2に#FFFFを格納 +STR2L START + PUSH 0,GR3 + PUSH 0,GR4 + XOR GR0,GR0 ; GR0:初期化 + AND GR2,GR2 ; (GR2 = 0)の場合、FINへジャンプ + JZE FIN ; ↓ + CPL GR2,MAXLEN ; (GR2 > MAXLEN)の場合、LENOVへジャンプ + JPL LENOV ; ↓ + ST GR1,STR ; STR <- GR1 文字列の開始アドレス + ST GR2,LEN ; LEN <- GR2 + LAD GR2,10 ; GR2:10進数の「10」 + XOR GR3,GR3 ; GR3:値の一時格納 + XOR GR4,GR4 ; GR4:インデックス +STOL CPL GR4,LEN ; ループ先頭。(GR4 = LEN)の場合、ループ脱出 + JZE CP ; ↓ + LD GR1,STR ; GR1に、入力文字列中の次の桁を格納 + ADDL GR1,GR4 ; ↓ + LD GR1,0,GR1 ; ↓ + CPL GR1,ZERO ; (GR1 < '0')の場合、NANへジャンプ + JMI NAN ; ↓ + CPL GR1,NINE ; (GR1 > '9')の場合、NANへジャンプ + JPL NAN ; ↓ + SUBL GR1,ZERO ; GR1の文字を、対応する数値に変換 + ST GR4,NLEN ; GR4 <- LEN - NLEN - 1 + LD GR4,LEN ; ↓ + SUBA GR4,NLEN ; ↓ +MUL10 CPA GR4,=1 ; ループ先頭。GR1 <- 10 ** GR4 + JZE NEXT ; (GR4 = 1)の場合、ループ脱出 + JMI NEXT ; ↓ + CALL MULL ; MULLを呼び出し、GR0 <- GR1 * GR2 + JOV FIN ; ↓ + LD GR1,GR0 ; GR1 <- GR0 + LAD GR4,-1,GR4 ; GR4 <- GR4 -1 + JUMP MUL10 ; ループ終端 +NEXT LD GR4,NLEN ; GR4 <- NLEN。復元 + ADDL GR3,GR1 ; GR3 <- GR3 + GR1 + JOV FIN ; ↓ + LAD GR4,1,GR4 ; GR4 <- GR4 + 1 + JUMP STOL ; ループ終端 +NAN LAD GR2,#FFFF ; GR2 <- #FFFF + JUMP FIN ; FINへジャンプ +CP LD GR1,GR3 ; GR0 <- GR3 + LD GR0,LEN ; GR0 <- LEN + JUMP FIN +LENOV LAD GR0,#FFFF + SRA GR0,1 +FIN POP GR4 + POP GR3 + RET +ZERO DC '0' +NINE DC '9' +MAXLEN DC 10 ; 10桁の数値まで入力可能 +STR DS 1 +LEN DS 1 +NLEN DS 1 + END +;;; 0〜65535の範囲にある正数のかけ算（筆算方式）を行う +;;; 入力 GR1:被乗数 GR2:乗数 +;;; 出力 GR0:積 +;;; 積が65535より大きい場合は、GR0は積の下位16ビットになり、オーバーフロー +MULL START + PUSH 0,GR1 + PUSH 0,GR3 + XOR GR0,GR0 ; 積 + AND GR1,GR1 ; (GR1 = 0)の場合、終了 + JZE FIN ; ↓ + AND GR2,GR2 ; (GR2 = 0)の場合、終了 + JZE FIN ; ↓ + LAD GR3,1 ; 対象ビット +LOOP PUSH 0,GR3 ; ループ先頭。GR2のビット中でGR3が示すビットが0の場合、NEXTへジャンプ + AND GR3,GR2 ; ↓ + POP GR3 ; ↓ + JZE NEXT ; ↓ + ADDL GR0,GR1 ; GR0 <- GR0 + GR1 + JOV FIN ; GR0がオーバーフローした場合、ループ脱出 +NEXT SLL GR3,1 ; GR3を1回左シフト + AND GR3,GR3 ; (GR3 = 0)の場合、ループ脱出 + JZE FIN ; ↓ + CPL GR3,GR2 ; (GR3 > GR2)の場合、ループ脱出 + JPL FIN ; ↓ + SLL GR1,1 ; GR1を1回左シフト + JOV FIN ; GR1がオーバーフローした場合、ループ脱出 + JUMP LOOP ; ループ終端 +FIN POP GR3 + POP GR1 + RET + END diff --git a/test/system/Makefile b/test/system/Makefile index 9668e4c..1340f45 100644 --- a/test/system/Makefile +++ b/test/system/Makefile @@ -1,5 +1,11 @@ -check: casl2 comet2 dumpword - $(MAKE) -sC casl2 - $(MAKE) -sC comet2 - $(MAKE) -sC dumpword +# 複数の子ディレクトリーでmakeを実行 +CMDS = casl2 comet2 dumpword +define make_dirs + $(foreach d,$1,$(MAKE) -sC $d $2) +endef +check: + @$(call make_dirs,$(CMDS),$@; ) + +clean: + @$(call make_dirs,$(CMDS),$@; ) diff --git a/test/system/casl2/CASL2.log b/test/system/casl2/CASL2.log deleted file mode 100644 index 0f459f7..0000000 --- a/test/system/casl2/CASL2.log +++ /dev/null @@ -1,587 +0,0 @@ -cmd_SRA_sra_z: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra_z/detail.log - -cmd_XOR_xor0: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor0/detail.log - -cmd_SUBL_subl0_lo: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0_lo/detail.log - -cmd_JPL_jpl_o: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JPL_jpl_o/detail.log - -cmd_AND_and0_s: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_AND_and0_s/detail.log - -cmd_SLA_sla_oz: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla_oz/detail.log - -cmd_RPUSH_rpush: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_RPUSH_rpush/detail.log - -cmd_ADDL_addl2: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl2/detail.log - -cmd_JNZ_jnz_m: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JNZ_jnz_m/detail.log - -cmd_OR_or0_s: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OR_or0_s/detail.log - -cmd_SVC_svc2: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SVC_svc2/detail.log - -err_205: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_205/detail.log - -cmd_CPA_cpa2_s: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa2_s/detail.log - -err_106_DS: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_106_DS/detail.log - -cmd_LD_ld1: Test Success 2010-12-14 01:13:01 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LD_ld1/detail.log - -lib_mull: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_mull/detail.log - -cmd_ADDA_adda0_ao: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0_ao/detail.log - -cmd_ST_st0: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ST_st0/detail.log - -opt_slaO: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slaO/detail.log - -cmd_AND_and1: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_AND_and1/detail.log - -cmd_AND_and0_z: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_AND_and0_z/detail.log - -lib_outl: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_outl/detail.log - -cmd_ADDL_addl0__o: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0__o/detail.log - -cmd_SUBL_subl2: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl2/detail.log - -cmd_JMI_jmi_m: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JMI_jmi_m/detail.log - -err_116: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_116/detail.log - -cmd_JNZ_jnz_p: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JNZ_jnz_p/detail.log - -cmd_CPA_cpa0: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa0/detail.log - -cmd_IN_in: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_IN_in/detail.log - -cmd_SUBL_subl0__z: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0__z/detail.log - -cmd_JOV_jov_m: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JOV_jov_m/detail.log - -cmd_POP_push_pop_0: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_POP_push_pop_0/detail.log - -cmd_JPL_jpl_m: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JPL_jpl_m/detail.log - -err_203: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_203/detail.log - -err_125: Test Success 2010-12-14 01:13:02 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_125/detail.log - -lib_inl: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_inl/detail.log - -cmd_SLA_sla_s: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla_s/detail.log - -cmd_JOV_jov_z: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JOV_jov_z/detail.log - -cmd_SRA_sra_oz: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra_oz/detail.log - -err_124: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_124/detail.log - -lib_outb: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_outb/detail.log - -opt_s: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_s/detail.log - -cmd_SLL_sll_o: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll_o/detail.log - -cmd_SLL_sll: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll/detail.log - -cmd_JNZ_jnz_z: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JNZ_jnz_z/detail.log - -cmd_CPA_cpa1_s: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa1_s/detail.log - -cmd_XOR_xor1: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor1/detail.log - -cmd_SLL_sll_os: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll_os/detail.log - -cmd_JMI_jmi_o: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JMI_jmi_o/detail.log - -opt_slaotd: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slaotd/detail.log - -opt_slA: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slA/detail.log - -err_204: Test Success 2010-12-14 01:13:03 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_204/detail.log - -cmd_JUMP_jump_p: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JUMP_jump_p/detail.log - -cmd_ADDA_adda0_as1: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0_as1/detail.log - -cmd_SUBA_suba1: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba1/detail.log - -lib_mula: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_mula/detail.log - -lib_abs: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_abs/detail.log - -cmd_SLL_sll_z: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll_z/detail.log - -err_120: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_120/detail.log - -cmd_SUBA_suba0_lo: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0_lo/detail.log - -cmd_JNZ_jnz_o: Test Success 2010-12-14 01:13:04 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JNZ_jnz_o/detail.log - -cmd_SUBA_suba0: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0/detail.log - -cmd_ADDA_adda1: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda1/detail.log - -lib_minim: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_minim/detail.log - -cmd_XOR_xor0_z: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor0_z/detail.log - -cmd_CPL_cpl0: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl0/detail.log - -cmd_OR_or2: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OR_or2/detail.log - -opt_slaot: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slaot/detail.log - -err_111: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_111/detail.log - -cmd_SLL_sll_oz: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll_oz/detail.log - -cmd_DC_dc_c0: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DC_dc_c0/detail.log - -cmd_CPL_cpl1_s: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl1_s/detail.log - -cmd_DS_ds: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DS_ds/detail.log - -cmd_JMI_jmi_z: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JMI_jmi_z/detail.log - -cmd_LAD_lad1_o: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LAD_lad1_o/detail.log - -cmd_SRA_sra: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra/detail.log - -cmd_DC_dc_i1: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DC_dc_i1/detail.log - -err_108: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_108/detail.log - -err_207: Test Success 2010-12-14 01:13:05 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_207/detail.log - -opt_slao_T: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slao_T/detail.log - -cmd_OR_or0_z: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OR_or0_z/detail.log - -err_101: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_101/detail.log - -err_106_DC: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_106_DC/detail.log - -cmd_ADDL_addl0_as1: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0_as1/detail.log - -cmd_SLL_sll_s: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLL_sll_s/detail.log - -cmd_RPOP_rpop: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_RPOP_rpop/detail.log - -cmd_SUBA_suba0__o: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0__o/detail.log - -cmd_LAD_lad0: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LAD_lad0/detail.log - -cmd_JOV_jov_o: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JOV_jov_o/detail.log - -cmd_ADDL_addl1: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl1/detail.log - -cmd_ADDA_adda0_az: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0_az/detail.log - -cmd_DC_dc_i0: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DC_dc_i0/detail.log - -opt_opterr: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_opterr/detail.log - -cmd_LD_ld0_l: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LD_ld0_l/detail.log - -cmd_AND_and0: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_AND_and0/detail.log - -ADDAコマンドのテスト。正常系 -cmd_ADDA_adda0: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0/detail.log - -cmd_JZE_jze_z: Test Success 2010-12-14 01:13:06 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JZE_jze_z/detail.log - -err_126: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_126/detail.log - -err_112: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_112/detail.log - -opt_sL: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_sL/detail.log - -cmd_OUT_out: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OUT_out/detail.log - -cmd_SLA_sla: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla/detail.log - -cmd_LD_ld0: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LD_ld0/detail.log - -cmd_SUBL_subl0: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0/detail.log - -cmd_SRA_sra_os: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra_os/detail.log - -err_123: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_123/detail.log - -err_105: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_105/detail.log - -cmd_SUBA_suba0_ao: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0_ao/detail.log - -cmd_SVC_svc1: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SVC_svc1/detail.log - -cmd_JMI_jmi_p: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JMI_jmi_p/detail.log - -cmd_JZE_jze_m: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JZE_jze_m/detail.log - -cmd_DC_dc_i_of: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DC_dc_i_of/detail.log - -cmd_SRA_sra_s: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra_s/detail.log - -cmd_ADDA_adda2: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda2/detail.log - -cmd_SUBA_suba0__z: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0__z/detail.log - -err_104: Test Success 2010-12-14 01:13:07 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_104/detail.log - -cmd_XOR_xor2: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor2/detail.log - -cmd_CPA_cpa0_z: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa0_z/detail.log - -lib_rev: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_rev/detail.log - -err_206: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_206/detail.log - -err_119: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_119/detail.log - -cmd_SRL_srl_z: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRL_srl_z/detail.log - -cmd_SLA_sla_z: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla_z/detail.log - -cmd_JUMP_jump_o: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JUMP_jump_o/detail.log - -err_113: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_113/detail.log - -cmd_ADDL_addl0: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0/detail.log - -cmd_OR_or1: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OR_or1/detail.log - -cmd_SLA_sla_o: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla_o/detail.log - -cmd_ADDL_addl0_ao: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0_ao/detail.log - -cmd_OR_or0: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_OR_or0/detail.log - -cmd_ADDL_addl0_lo: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0_lo/detail.log - -cmd_CPA_cpa0_s: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa0_s/detail.log - -err_118: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_118/detail.log - -ADDAコマンドのテスト。オーバーフロー発生 -cmd_ADDA_adda0__o: Test Success 2010-12-14 01:13:08 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0__o/detail.log - -cmd_ADDA_adda0_as0: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0_as0/detail.log - -cmd_XOR_xor0_s: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor0_s/detail.log - -err_202: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_202/detail.log - -cmd_JOV_jov_p: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JOV_jov_p/detail.log - -cmd_SUBL_subl0__o: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0__o/detail.log - -cmd_SRL_srl_s: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRL_srl_s/detail.log - -cmd_SUBA_suba0_as0: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0_as0/detail.log - -cmd_DS_ds_0: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DS_ds_0/detail.log - -cmd_SUBL_subl0_ao: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0_ao/detail.log - -cmd_ADDL_addl0_az: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0_az/detail.log - -err_103: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_103/detail.log - -cmd_SRL_srl_o: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRL_srl_o/detail.log - -cmd_JPL_jpl_z: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JPL_jpl_z/detail.log - -cmd_CALL_call0: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CALL_call0/detail.log - -err_115: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_115/detail.log - -err_117: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_117/detail.log - -cmd_JPL_jpl_p: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JPL_jpl_p/detail.log - -err_114: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_114/detail.log - -cmd_NOP_nop: Test Success 2010-12-14 01:13:09 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_NOP_nop/detail.log - -cmd_JZE_jze_o: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JZE_jze_o/detail.log - -cmd_SUBA_suba2: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba2/detail.log - -opt_h: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_h/detail.log - -cmd_SUBL_subl0_as1: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0_as1/detail.log - -cmd_JUMP_jump_m: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JUMP_jump_m/detail.log - -cmd_CALL_call1: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CALL_call1/detail.log - -cmd_SUBL_subl1: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl1/detail.log - -cmd_SUBL_subl0_as0: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBL_subl0_as0/detail.log - -cmd_ADDA_adda0_lo: Test Success 2010-12-14 01:13:10 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0_lo/detail.log - -lib_divl: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_divl/detail.log - -err_110: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_110/detail.log - -cmd_CPL_cpl0_ls: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl0_ls/detail.log - -cmd_ADDL_addl0__z: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0__z/detail.log - -cmd_CPL_cpl0_s: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl0_s/detail.log - -cmd_SRL_srl: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRL_srl/detail.log - -cmd_XOR_xor2_clear: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_XOR_xor2_clear/detail.log - -err_109: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_109/detail.log - -cmd_ST_st1: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ST_st1/detail.log - -lib_addl32: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_addl32/detail.log - -cmd_ADDL_addl0_as0: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDL_addl0_as0/detail.log - -cmd_SRL_srl_oz: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRL_srl_oz/detail.log - -cmd_CPL_cpl2_s: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl2_s/detail.log - -hello: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/hello/detail.log - -cmd_DC_dc_c1: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_DC_dc_c1/detail.log - -cmd_CPL_cpl0_z: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPL_cpl0_z/detail.log - -cmd_JUMP_jump_z: Test Success 2010-12-14 01:13:11 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JUMP_jump_z/detail.log - -cmd_JZE_jze_p: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_JZE_jze_p/detail.log - -lib_outa: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_outa/detail.log - -cmd_LD_ld2: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LD_ld2/detail.log - -cmd_POP_push_pop_1: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_POP_push_pop_1/detail.log - -cmd_LAD_lad1: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LAD_lad1/detail.log - -err_121: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_121/detail.log - -cmd_AND_and2: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_AND_and2/detail.log - -opt_slaOn: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/opt_slaOn/detail.log - -cmd_ADDA_adda0__z: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_ADDA_adda0__z/detail.log - -cmd_SRA_sra_o: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SRA_sra_o/detail.log - -cmd_CPA_cpa0_ls: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_CPA_cpa0_ls/detail.log - -cmd_SUBA_suba0_as1: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SUBA_suba0_as1/detail.log - -cmd_SLA_sla_os: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_SLA_sla_os/detail.log - -cmd_LAD_lad1_s: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/cmd_LAD_lad1_s/detail.log - -err_107: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/err_107/detail.log - -lib_outd_q15: Test Success 2010-12-14 01:13:12 -Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/lib_outd_q15/detail.log - diff --git a/test/system/casl2/Define.mk b/test/system/casl2/Define.mk index 65eace2..92e3b8e 100644 --- a/test/system/casl2/Define.mk +++ b/test/system/casl2/Define.mk @@ -27,7 +27,7 @@ RM ?= rm -f ECHO ?= echo -TIME ?= /usr/bin/time --quiet +TIME ?= time DIFF ?= diff -c @@ -63,12 +63,6 @@ define chk_file_ext $(if $(wildcard $1),$(error $1 exists in $(CURRDIR))) endef -# chk_file_notext: 指定されたファイルが実在しない場合、エラー -# 用例: $(call chk_file_notext,file) -define chk_file_notext - $(if $(wildcard $1),,$(error $1 not exists in $(CURRDIR))) -endef - ###################################################################### # テストグループのディレクトリー ###################################################################### diff --git a/test/system/casl2/Define_group.mk b/test/system/casl2/Define_group.mk index f3cda2c..a572469 100644 --- a/test/system/casl2/Define_group.mk +++ b/test/system/casl2/Define_group.mk @@ -56,6 +56,7 @@ endef # テストのログファイルをグループログファイルに出力。引数は、テスト、グループログファイル # 用例: $(call group_log_each,file_test_log,file_group_log) define group_log_each + $(ECHO) $(dir $1) >>$2; if test -s $1; then $(CAT) $1 >>$2; else $(ECHO) $(dir $1)": no log" >>$2; fi $(ECHO) >>$2; diff --git a/test/system/casl2/Define_test.mk b/test/system/casl2/Define_test.mk index 78394cb..c3508ca 100644 --- a/test/system/casl2/Define_test.mk +++ b/test/system/casl2/Define_test.mk @@ -16,11 +16,10 @@ endef # テスト実行の経過時間を、ファイルに出力して表示 # 引数は、テスト名、コマンドファイル、出力ファイル -# 用例: $(call time_cmd,name,file_cmd,file_out) +# 用例: $(call time_cmd,file_cmd,file_out) define time_cmd - $(call chk_file_notext,$2) - $(CHMOD) u+x $2 - $(TIME) -f"$1: %E" -o $3 ./$2 >$(DEV_NULL) 2>&1 + if test ! -x $1; then $(CHMOD) u+x $1; fi + ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2 endef # テスト実行コマンド。引数は、コマンドファイル、出力ファイル、エラーファイル @@ -28,8 +27,7 @@ endef # エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。 # 用例: $(call exec_cmd,file_cmd,file_out,file_err) define exec_cmd - $(call chk_file_notext,$1) - $(CHMOD) u+x $1 + if test ! -x $1; then $(CHMOD) u+x $1; fi ./$1 >>$2 2>$3 if test -s $3; then $(CAT) $3 >>$2; fi $(call rm_null,$3) @@ -63,7 +61,6 @@ endef # 引数は、対象ファイル群、出力ファイル # 用例: $(call report_files,list_file_target,file_out) define report_files - $(call chk_file_ext,$2) $(foreach tfile,$1,$(call report_file,$(tfile),$2)) endef diff --git a/test/system/casl2/Makefile b/test/system/casl2/Makefile index e22d03c..6be7c11 100644 --- a/test/system/casl2/Makefile +++ b/test/system/casl2/Makefile @@ -2,14 +2,13 @@ # テストグループのMakefile # # オペレーター -# make : すべてのテストを実施し、ログファイルを作成 -# make check : ↓ -# make create : TESTNAMEで指定されたテストを新規に作成 -# make set : すべてのテストの、想定結果を出力 -# make checkeach: すべてのテストを実施 -# make report : ログファイルから、テストの結果をレポート -# make clean : すべてのテストで、"make" で生成されたファイルをクリア -# make cleanall: すべてのテストで、"make" と "make set" で生成されたファイルをクリア +# make : すべてのテストを実行し、結果をログファイルに出力 +# make check : ↓ +# make checkall : すべてのテストを実行し、結果と実行時間をログファイルに出力 +# make time : すべてのテストを実行し、実行時間をログファイルに出力 +# make create : TESTNAMEで指定されたテストを新規に作成 +# make clean : すべてのテストで、"make" で生成されたファイルをクリア +# make cleantime: すべてのテストで、実行時間のログファイルをクリア SHELL = /bin/sh diff --git a/test/system/casl2/Report.log b/test/system/casl2/Report.log deleted file mode 100644 index ba527dc..0000000 --- a/test/system/casl2/Report.log +++ /dev/null @@ -1,2 +0,0 @@ -casl2: 195 / 195 tests passed. Detail in /home/kazubito/2010_12/yacasl2/test/system/casl2/CASL2.log -casl2: All tests are succeded. diff --git a/test/system/casl2/Test.mk b/test/system/casl2/Test.mk index edfa278..023bce0 100644 --- a/test/system/casl2/Test.mk +++ b/test/system/casl2/Test.mk @@ -13,25 +13,29 @@ # make clean : "make" で作成されたファイルをクリア # make cleanall: "make" と "make set" で作成されたファイルをクリア -SHELL = /bin/sh +SHELL = /bin/bash # テスト名。カレントディレクトリー名から取得 TEST = $(notdir $(CURRDIR)) +# コマンドファイルのソース +CMDSRC_FILE := $(CMD_FILE) +#CMDSRC_FILE := $(CMD_FILE).c + .PHONY: check set reset time cleantime clean cleanall check: clean $(DETAIL_FILE) @$(call disp_test_log,$(LOG_FILE)) -checkall: check $(TIME_FILE) +checkall: clean $(DETAIL_FILE) $(TIME_FILE) @$(CAT) $(TIME_FILE) >>$(LOG_FILE) @$(call disp_test_log,$(LOG_FILE)) set: $(TEST0_FILE) + @-$(call exec_cmd,$^,$@,$(ERR_FILE)) @$(CAT) $^ -reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) +reset: cleanall set time: cleantime $(TIME_FILE) @@ -44,22 +48,17 @@ clean: cleanall: clean @$(RM) $(TEST0_FILE) -$(CMD_FILE): - @$(call chk_file_notext,$@) - @$(CHMOD) u+x $@ - -$(TEST0_FILE) $(TEST1_FILE): $(CMD_FILE) +$(TEST1_FILE): $(CMD_FILE) @-$(call exec_cmd,$^,$@,$(ERR_FILE)) $(DIFF_FILE): $(TEST0_FILE) $(TEST1_FILE) - @$(call chk_file_notext,$(TEST0_FILE)) @-$(call diff_files,$^,$@) $(LOG_FILE): $(DIFF_FILE) @$(call test_log,$(TEST),$^,$@) $(DETAIL_FILE): $(LOG_FILE) - @$(call report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) + @$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) $(TIME_FILE): $(CMD_FILE) - @-$(call time_cmd,$(TEST),$^,$@) + $(call time_cmd,$^,$@) diff --git a/test/system/casl2/lib_abs/cmd b/test/system/casl2/lib_abs/cmd index 2adc668..b96e675 100755 --- a/test/system/casl2/lib_abs/cmd +++ b/test/system/casl2/lib_abs/cmd @@ -1 +1 @@ -../../../../casl2 abs.casl ../../../../as/casl2lib/outa.casl +../../../../casl2 abs.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_addl32/cmd b/test/system/casl2/lib_addl32/cmd index accd9a7..3c45656 100755 --- a/test/system/casl2/lib_addl32/cmd +++ b/test/system/casl2/lib_addl32/cmd @@ -1 +1 @@ -../../../../casl2 addl32.casl ../../../../as/casl2lib/addl32.casl ../../../../as/casl2lib/outl.casl +../../../../casl2 addl32.casl ../../../../as/casl2lib/addl32.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_divl/cmd b/test/system/casl2/lib_divl/cmd index 00272a4..f5cbb75 100755 --- a/test/system/casl2/lib_divl/cmd +++ b/test/system/casl2/lib_divl/cmd @@ -1 +1 @@ -../../../../casl2 -M640 divl.casl ../../../../as/casl2lib/outl.casl +../../../../casl2 -M640 divl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_inl/cmd b/test/system/casl2/lib_inl/cmd index 77bf6a6..7a7215c 100755 --- a/test/system/casl2/lib_inl/cmd +++ b/test/system/casl2/lib_inl/cmd @@ -1 +1 @@ -../../../../casl2 -M720 inl.casl ../../../../as/casl2lib/inl.casl ../../../../as/casl2lib/outl.casl >$2; if test -s $1; then $(CAT) $1 >>$2; else $(ECHO) $(dir $1)": no log" >>$2; fi $(ECHO) >>$2; diff --git a/test/system/comet2/Define_test.mk b/test/system/comet2/Define_test.mk index 78394cb..c3508ca 100644 --- a/test/system/comet2/Define_test.mk +++ b/test/system/comet2/Define_test.mk @@ -16,11 +16,10 @@ endef # テスト実行の経過時間を、ファイルに出力して表示 # 引数は、テスト名、コマンドファイル、出力ファイル -# 用例: $(call time_cmd,name,file_cmd,file_out) +# 用例: $(call time_cmd,file_cmd,file_out) define time_cmd - $(call chk_file_notext,$2) - $(CHMOD) u+x $2 - $(TIME) -f"$1: %E" -o $3 ./$2 >$(DEV_NULL) 2>&1 + if test ! -x $1; then $(CHMOD) u+x $1; fi + ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2 endef # テスト実行コマンド。引数は、コマンドファイル、出力ファイル、エラーファイル @@ -28,8 +27,7 @@ endef # エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。 # 用例: $(call exec_cmd,file_cmd,file_out,file_err) define exec_cmd - $(call chk_file_notext,$1) - $(CHMOD) u+x $1 + if test ! -x $1; then $(CHMOD) u+x $1; fi ./$1 >>$2 2>$3 if test -s $3; then $(CAT) $3 >>$2; fi $(call rm_null,$3) @@ -63,7 +61,6 @@ endef # 引数は、対象ファイル群、出力ファイル # 用例: $(call report_files,list_file_target,file_out) define report_files - $(call chk_file_ext,$2) $(foreach tfile,$1,$(call report_file,$(tfile),$2)) endef diff --git a/test/system/comet2/Makefile b/test/system/comet2/Makefile index e22d03c..6be7c11 100644 --- a/test/system/comet2/Makefile +++ b/test/system/comet2/Makefile @@ -2,14 +2,13 @@ # テストグループのMakefile # # オペレーター -# make : すべてのテストを実施し、ログファイルを作成 -# make check : ↓ -# make create : TESTNAMEで指定されたテストを新規に作成 -# make set : すべてのテストの、想定結果を出力 -# make checkeach: すべてのテストを実施 -# make report : ログファイルから、テストの結果をレポート -# make clean : すべてのテストで、"make" で生成されたファイルをクリア -# make cleanall: すべてのテストで、"make" と "make set" で生成されたファイルをクリア +# make : すべてのテストを実行し、結果をログファイルに出力 +# make check : ↓ +# make checkall : すべてのテストを実行し、結果と実行時間をログファイルに出力 +# make time : すべてのテストを実行し、実行時間をログファイルに出力 +# make create : TESTNAMEで指定されたテストを新規に作成 +# make clean : すべてのテストで、"make" で生成されたファイルをクリア +# make cleantime: すべてのテストで、実行時間のログファイルをクリア SHELL = /bin/sh diff --git a/test/system/comet2/Report.log b/test/system/comet2/Report.log deleted file mode 100644 index 5539509..0000000 --- a/test/system/comet2/Report.log +++ /dev/null @@ -1,2 +0,0 @@ -comet2: 150 / 150 tests passed. Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/COMET2.log -comet2: All tests are succeded. diff --git a/test/system/comet2/Test.mk b/test/system/comet2/Test.mk index edfa278..023bce0 100644 --- a/test/system/comet2/Test.mk +++ b/test/system/comet2/Test.mk @@ -13,25 +13,29 @@ # make clean : "make" で作成されたファイルをクリア # make cleanall: "make" と "make set" で作成されたファイルをクリア -SHELL = /bin/sh +SHELL = /bin/bash # テスト名。カレントディレクトリー名から取得 TEST = $(notdir $(CURRDIR)) +# コマンドファイルのソース +CMDSRC_FILE := $(CMD_FILE) +#CMDSRC_FILE := $(CMD_FILE).c + .PHONY: check set reset time cleantime clean cleanall check: clean $(DETAIL_FILE) @$(call disp_test_log,$(LOG_FILE)) -checkall: check $(TIME_FILE) +checkall: clean $(DETAIL_FILE) $(TIME_FILE) @$(CAT) $(TIME_FILE) >>$(LOG_FILE) @$(call disp_test_log,$(LOG_FILE)) set: $(TEST0_FILE) + @-$(call exec_cmd,$^,$@,$(ERR_FILE)) @$(CAT) $^ -reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) +reset: cleanall set time: cleantime $(TIME_FILE) @@ -44,22 +48,17 @@ clean: cleanall: clean @$(RM) $(TEST0_FILE) -$(CMD_FILE): - @$(call chk_file_notext,$@) - @$(CHMOD) u+x $@ - -$(TEST0_FILE) $(TEST1_FILE): $(CMD_FILE) +$(TEST1_FILE): $(CMD_FILE) @-$(call exec_cmd,$^,$@,$(ERR_FILE)) $(DIFF_FILE): $(TEST0_FILE) $(TEST1_FILE) - @$(call chk_file_notext,$(TEST0_FILE)) @-$(call diff_files,$^,$@) $(LOG_FILE): $(DIFF_FILE) @$(call test_log,$(TEST),$^,$@) $(DETAIL_FILE): $(LOG_FILE) - @$(call report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) + @$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) $(TIME_FILE): $(CMD_FILE) - @-$(call time_cmd,$(TEST),$^,$@) + $(call time_cmd,$^,$@) diff --git a/test/system/dumpword/DUMPWORD.log b/test/system/dumpword/DUMPWORD.log deleted file mode 100644 index bfacb61..0000000 --- a/test/system/dumpword/DUMPWORD.log +++ /dev/null @@ -1,12 +0,0 @@ -noopt: Test Success 2010-12-14 01:13:24 -Detail in /home/kazubito/2010_12/yacasl2/test/system/dumpword/noopt/detail.log - -a: Test Success 2010-12-14 01:13:24 -Detail in /home/kazubito/2010_12/yacasl2/test/system/dumpword/a/detail.log - -l: Test Success 2010-12-14 01:13:24 -Detail in /home/kazubito/2010_12/yacasl2/test/system/dumpword/l/detail.log - -chars: Test Success 2010-12-14 01:13:24 -Detail in /home/kazubito/2010_12/yacasl2/test/system/dumpword/chars/detail.log - diff --git a/test/system/dumpword/Define.mk b/test/system/dumpword/Define.mk index 65eace2..92e3b8e 100644 --- a/test/system/dumpword/Define.mk +++ b/test/system/dumpword/Define.mk @@ -27,7 +27,7 @@ RM ?= rm -f ECHO ?= echo -TIME ?= /usr/bin/time --quiet +TIME ?= time DIFF ?= diff -c @@ -63,12 +63,6 @@ define chk_file_ext $(if $(wildcard $1),$(error $1 exists in $(CURRDIR))) endef -# chk_file_notext: 指定されたファイルが実在しない場合、エラー -# 用例: $(call chk_file_notext,file) -define chk_file_notext - $(if $(wildcard $1),,$(error $1 not exists in $(CURRDIR))) -endef - ###################################################################### # テストグループのディレクトリー ###################################################################### diff --git a/test/system/dumpword/Define_group.mk b/test/system/dumpword/Define_group.mk index f3cda2c..a572469 100644 --- a/test/system/dumpword/Define_group.mk +++ b/test/system/dumpword/Define_group.mk @@ -56,6 +56,7 @@ endef # テストのログファイルをグループログファイルに出力。引数は、テスト、グループログファイル # 用例: $(call group_log_each,file_test_log,file_group_log) define group_log_each + $(ECHO) $(dir $1) >>$2; if test -s $1; then $(CAT) $1 >>$2; else $(ECHO) $(dir $1)": no log" >>$2; fi $(ECHO) >>$2; diff --git a/test/system/dumpword/Define_test.mk b/test/system/dumpword/Define_test.mk index 78394cb..c3508ca 100644 --- a/test/system/dumpword/Define_test.mk +++ b/test/system/dumpword/Define_test.mk @@ -16,11 +16,10 @@ endef # テスト実行の経過時間を、ファイルに出力して表示 # 引数は、テスト名、コマンドファイル、出力ファイル -# 用例: $(call time_cmd,name,file_cmd,file_out) +# 用例: $(call time_cmd,file_cmd,file_out) define time_cmd - $(call chk_file_notext,$2) - $(CHMOD) u+x $2 - $(TIME) -f"$1: %E" -o $3 ./$2 >$(DEV_NULL) 2>&1 + if test ! -x $1; then $(CHMOD) u+x $1; fi + ($(TIME) ./$1 1>$(DEV_NULL) 2>$(DEV_NULL)) 2>&1 | $(GREP) '^real' >$2 endef # テスト実行コマンド。引数は、コマンドファイル、出力ファイル、エラーファイル @@ -28,8 +27,7 @@ endef # エラー発生時は、エラー出力を出力ファイルとエラーファイルに保存。 # 用例: $(call exec_cmd,file_cmd,file_out,file_err) define exec_cmd - $(call chk_file_notext,$1) - $(CHMOD) u+x $1 + if test ! -x $1; then $(CHMOD) u+x $1; fi ./$1 >>$2 2>$3 if test -s $3; then $(CAT) $3 >>$2; fi $(call rm_null,$3) @@ -63,7 +61,6 @@ endef # 引数は、対象ファイル群、出力ファイル # 用例: $(call report_files,list_file_target,file_out) define report_files - $(call chk_file_ext,$2) $(foreach tfile,$1,$(call report_file,$(tfile),$2)) endef diff --git a/test/system/dumpword/Makefile b/test/system/dumpword/Makefile index e22d03c..6be7c11 100644 --- a/test/system/dumpword/Makefile +++ b/test/system/dumpword/Makefile @@ -2,14 +2,13 @@ # テストグループのMakefile # # オペレーター -# make : すべてのテストを実施し、ログファイルを作成 -# make check : ↓ -# make create : TESTNAMEで指定されたテストを新規に作成 -# make set : すべてのテストの、想定結果を出力 -# make checkeach: すべてのテストを実施 -# make report : ログファイルから、テストの結果をレポート -# make clean : すべてのテストで、"make" で生成されたファイルをクリア -# make cleanall: すべてのテストで、"make" と "make set" で生成されたファイルをクリア +# make : すべてのテストを実行し、結果をログファイルに出力 +# make check : ↓ +# make checkall : すべてのテストを実行し、結果と実行時間をログファイルに出力 +# make time : すべてのテストを実行し、実行時間をログファイルに出力 +# make create : TESTNAMEで指定されたテストを新規に作成 +# make clean : すべてのテストで、"make" で生成されたファイルをクリア +# make cleantime: すべてのテストで、実行時間のログファイルをクリア SHELL = /bin/sh diff --git a/test/system/dumpword/Report.log b/test/system/dumpword/Report.log deleted file mode 100644 index 41a6a94..0000000 --- a/test/system/dumpword/Report.log +++ /dev/null @@ -1,2 +0,0 @@ -dumpword: 4 / 4 tests passed. Detail in /home/kazubito/2010_12/yacasl2/test/system/dumpword/DUMPWORD.log -dumpword: All tests are succeded. diff --git a/test/system/dumpword/Test.mk b/test/system/dumpword/Test.mk index edfa278..023bce0 100644 --- a/test/system/dumpword/Test.mk +++ b/test/system/dumpword/Test.mk @@ -13,25 +13,29 @@ # make clean : "make" で作成されたファイルをクリア # make cleanall: "make" と "make set" で作成されたファイルをクリア -SHELL = /bin/sh +SHELL = /bin/bash # テスト名。カレントディレクトリー名から取得 TEST = $(notdir $(CURRDIR)) +# コマンドファイルのソース +CMDSRC_FILE := $(CMD_FILE) +#CMDSRC_FILE := $(CMD_FILE).c + .PHONY: check set reset time cleantime clean cleanall check: clean $(DETAIL_FILE) @$(call disp_test_log,$(LOG_FILE)) -checkall: check $(TIME_FILE) +checkall: clean $(DETAIL_FILE) $(TIME_FILE) @$(CAT) $(TIME_FILE) >>$(LOG_FILE) @$(call disp_test_log,$(LOG_FILE)) set: $(TEST0_FILE) + @-$(call exec_cmd,$^,$@,$(ERR_FILE)) @$(CAT) $^ -reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) +reset: cleanall set time: cleantime $(TIME_FILE) @@ -44,22 +48,17 @@ clean: cleanall: clean @$(RM) $(TEST0_FILE) -$(CMD_FILE): - @$(call chk_file_notext,$@) - @$(CHMOD) u+x $@ - -$(TEST0_FILE) $(TEST1_FILE): $(CMD_FILE) +$(TEST1_FILE): $(CMD_FILE) @-$(call exec_cmd,$^,$@,$(ERR_FILE)) $(DIFF_FILE): $(TEST0_FILE) $(TEST1_FILE) - @$(call chk_file_notext,$(TEST0_FILE)) @-$(call diff_files,$^,$@) $(LOG_FILE): $(DIFF_FILE) @$(call test_log,$(TEST),$^,$@) $(DETAIL_FILE): $(LOG_FILE) - @$(call report_files,$(LOG_FILE) $(CMD_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) + @$(call report_files,$(LOG_FILE) $(CMDSRC_FILE) $(TEST0_FILE) $(ERR_FILE) $(DIFF_FILE) $(TEST1_FILE),$@) $(TIME_FILE): $(CMD_FILE) - @-$(call time_cmd,$(TEST),$^,$@) + $(call time_cmd,$^,$@) diff --git a/test/unit/Report.log b/test/unit/Report.log deleted file mode 100644 index d55aed3..0000000 --- a/test/unit/Report.log +++ /dev/null @@ -1,2 +0,0 @@ -unit: 10 / 10 tests passed. Detail in /home/kazubito/2010_12/yacasl2/test/unit/UNIT.log -unit: All tests are succeded. diff --git a/test/unit/UNIT.log b/test/unit/UNIT.log deleted file mode 100644 index 84ee99c..0000000 --- a/test/unit/UNIT.log +++ /dev/null @@ -1,31 +0,0 @@ -getcmdtype: Test Success 2010-12-14 00:22:16 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/getcmdtype/detail.log - -hash: Test Success 2010-12-14 00:22:16 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/hash/detail.log - -addcerrlist: Test Success 2010-12-14 00:22:16 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/addcerrlist/detail.log - -関数setcerrのテスト -setcerr: Test Success 2010-12-14 00:22:17 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/setcerr/detail.log - -getcmdcode: Test Success 2010-12-14 00:22:17 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/getcmdcode/detail.log - -linetok: Test Success 2010-12-14 00:22:18 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/linetok/detail.log - -opdtok: Test Success 2010-12-14 00:22:19 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/opdtok/detail.log - -h2word: Test Success 2010-12-14 00:22:21 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/h2word/detail.log - -getgr: Test Success 2010-12-14 00:22:22 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/getgr/detail.log - -n2word: Test Success 2010-12-14 00:22:23 -Detail in /home/kazubito/2010_12/yacasl2/test/unit/n2word/detail.log -