From: j8takagi <j8takagi@nifty.com> Date: Sun, 19 Dec 2010 15:20:15 +0000 (+0900) Subject: CASL2LIBの状態が不正になっていたのを修正 X-Git-Tag: v0.1p15~13^2~1 X-Git-Url: https://www.j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55d1da968d999e33238da299f933c70d95bcc66c;p=YACASL2.git 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 <teststr.txt +../../../../casl2 -M720 inl.casl ../../../../as/casl2lib/inl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/str2l.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl <teststr.txt diff --git a/test/system/casl2/lib_minim/cmd b/test/system/casl2/lib_minim/cmd index 0d177a8..bcbbcd6 100755 --- a/test/system/casl2/lib_minim/cmd +++ b/test/system/casl2/lib_minim/cmd @@ -1 +1 @@ -../../../../casl2 minim.casl ../../../../as/casl2lib/minim.casl ../../../../as/casl2lib/outa.casl +../../../../casl2 minim.casl ../../../../as/casl2lib/minim.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl ../../../../as/casl2lib/abs.casl diff --git a/test/system/casl2/lib_mula/cmd b/test/system/casl2/lib_mula/cmd index e65078f..7571a28 100755 --- a/test/system/casl2/lib_mula/cmd +++ b/test/system/casl2/lib_mula/cmd @@ -1 +1 @@ -../../../../casl2 -M640 mula.casl ../../../../as/casl2lib/mula.casl ../../../../as/casl2lib/outa.casl +../../../../casl2 -M640 mula.casl ../../../../as/casl2lib/mula.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl \ No newline at end of file diff --git a/test/system/casl2/lib_mull/cmd b/test/system/casl2/lib_mull/cmd index 9579793..d5a5aef 100755 --- a/test/system/casl2/lib_mull/cmd +++ b/test/system/casl2/lib_mull/cmd @@ -1 +1 @@ -../../../../casl2 -M640 mull.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outl.casl +../../../../casl2 -M640 mull.casl ../../../../as/casl2lib/mull.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_outa/cmd b/test/system/casl2/lib_outa/cmd index 86d2172..020c437 100755 --- a/test/system/casl2/lib_outa/cmd +++ b/test/system/casl2/lib_outa/cmd @@ -1 +1 @@ -../../../../casl2 outa.casl ../../../../as/casl2lib/outa.casl +../../../../casl2 outa.casl ../../../../as/casl2lib/outa.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/abs.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_outb/cmd b/test/system/casl2/lib_outb/cmd index b61f6c6..d81cd1f 100755 --- a/test/system/casl2/lib_outb/cmd +++ b/test/system/casl2/lib_outb/cmd @@ -1 +1 @@ -../../../../casl2 outb.casl ../../../../as/casl2lib/outb.casl +../../../../casl2 outb.casl ../../../../as/casl2lib/outb.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/casl2/lib_outl/cmd b/test/system/casl2/lib_outl/cmd index 2b713d1..cd11286 100755 --- a/test/system/casl2/lib_outl/cmd +++ b/test/system/casl2/lib_outl/cmd @@ -1 +1 @@ -../../../../casl2 outl.casl ../../../../as/casl2lib/outl.casl +../../../../casl2 outl.casl ../../../../as/casl2lib/outl.casl ../../../../as/casl2lib/divl.casl ../../../../as/casl2lib/rev.casl diff --git a/test/system/comet2/COMET2.log b/test/system/comet2/COMET2.log deleted file mode 100644 index ea81549..0000000 --- a/test/system/comet2/COMET2.log +++ /dev/null @@ -1,450 +0,0 @@ -cmd_SRA_sra_z: Test Success 2010-12-14 01:13:15 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra_z/detail.log - -cmd_XOR_xor0: Test Success 2010-12-14 01:13:15 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor0/detail.log - -cmd_SUBL_subl0_lo: Test Success 2010-12-14 01:13:15 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0_lo/detail.log - -cmd_JPL_jpl_o: Test Success 2010-12-14 01:13:15 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JPL_jpl_o/detail.log - -cmd_AND_and0_s: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_AND_and0_s/detail.log - -cmd_SLA_sla_oz: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla_oz/detail.log - -cmd_RPUSH_rpush: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_RPUSH_rpush/detail.log - -cmd_ADDL_addl2: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl2/detail.log - -cmd_JNZ_jnz_m: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JNZ_jnz_m/detail.log - -cmd_OR_or0_s: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OR_or0_s/detail.log - -cmd_SVC_svc2: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SVC_svc2/detail.log - -err_205: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_205/detail.log - -cmd_CPA_cpa2_s: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa2_s/detail.log - -cmd_LD_ld1: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LD_ld1/detail.log - -cmd_ADDA_adda0_ao: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0_ao/detail.log - -cmd_ST_st0: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ST_st0/detail.log - -cmd_AND_and1: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_AND_and1/detail.log - -cmd_AND_and0_z: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_AND_and0_z/detail.log - -cmd_ADDL_addl0__o: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0__o/detail.log - -cmd_SUBL_subl2: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl2/detail.log - -cmd_JMI_jmi_m: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JMI_jmi_m/detail.log - -cmd_JNZ_jnz_p: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JNZ_jnz_p/detail.log - -cmd_CPA_cpa0: Test Success 2010-12-14 01:13:16 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa0/detail.log - -cmd_IN_in: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_IN_in/detail.log - -cmd_SUBL_subl0__z: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0__z/detail.log - -cmd_JOV_jov_m: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JOV_jov_m/detail.log - -cmd_POP_push_pop_0: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_POP_push_pop_0/detail.log - -cmd_JPL_jpl_m: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JPL_jpl_m/detail.log - -err_203: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_203/detail.log - -cmd_SLA_sla_s: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla_s/detail.log - -cmd_JOV_jov_z: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JOV_jov_z/detail.log - -cmd_SRA_sra_oz: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra_oz/detail.log - -cmd_SLL_sll_o: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll_o/detail.log - -cmd_SLL_sll: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll/detail.log - -cmd_JNZ_jnz_z: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JNZ_jnz_z/detail.log - -cmd_CPA_cpa1_s: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa1_s/detail.log - -cmd_XOR_xor1: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor1/detail.log - -cmd_SLL_sll_os: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll_os/detail.log - -cmd_JMI_jmi_o: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JMI_jmi_o/detail.log - -err_204: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_204/detail.log - -cmd_JUMP_jump_p: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JUMP_jump_p/detail.log - -cmd_ADDA_adda0_as1: Test Success 2010-12-14 01:13:17 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0_as1/detail.log - -cmd_SUBA_suba1: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba1/detail.log - -cmd_SLL_sll_z: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll_z/detail.log - -cmd_SUBA_suba0_lo: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0_lo/detail.log - -cmd_JNZ_jnz_o: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JNZ_jnz_o/detail.log - -cmd_SUBA_suba0: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0/detail.log - -cmd_ADDA_adda1: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda1/detail.log - -cmd_XOR_xor0_z: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor0_z/detail.log - -cmd_CPL_cpl0: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl0/detail.log - -cmd_OR_or2: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OR_or2/detail.log - -cmd_SLL_sll_oz: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll_oz/detail.log - -cmd_DC_dc_c0: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DC_dc_c0/detail.log - -cmd_CPL_cpl1_s: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl1_s/detail.log - -cmd_DS_ds: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DS_ds/detail.log - -cmd_JMI_jmi_z: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JMI_jmi_z/detail.log - -cmd_LAD_lad1_o: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LAD_lad1_o/detail.log - -cmd_SRA_sra: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra/detail.log - -cmd_DC_dc_i1: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DC_dc_i1/detail.log - -err_207: Test Success 2010-12-14 01:13:18 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_207/detail.log - -cmd_OR_or0_z: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OR_or0_z/detail.log - -cmd_ADDL_addl0_as1: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0_as1/detail.log - -cmd_SLL_sll_s: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLL_sll_s/detail.log - -cmd_RPOP_rpop: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_RPOP_rpop/detail.log - -cmd_SUBA_suba0__o: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0__o/detail.log - -cmd_LAD_lad0: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LAD_lad0/detail.log - -cmd_JOV_jov_o: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JOV_jov_o/detail.log - -err_201: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_201/detail.log - -cmd_ADDL_addl1: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl1/detail.log - -cmd_ADDA_adda0_az: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0_az/detail.log - -cmd_DC_dc_i0: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DC_dc_i0/detail.log - -cmd_LD_ld0_l: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LD_ld0_l/detail.log - -cmd_AND_and0: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_AND_and0/detail.log - -cmd_ADDA_adda0: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0/detail.log - -cmd_JZE_jze_z: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JZE_jze_z/detail.log - -cmd_OUT_out: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OUT_out/detail.log - -cmd_SLA_sla: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla/detail.log - -cmd_LD_ld0: Test Success 2010-12-14 01:13:19 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LD_ld0/detail.log - -cmd_SUBL_subl0: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0/detail.log - -cmd_SRA_sra_os: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra_os/detail.log - -cmd_SUBA_suba0_ao: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0_ao/detail.log - -cmd_SVC_svc1: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SVC_svc1/detail.log - -cmd_JMI_jmi_p: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JMI_jmi_p/detail.log - -cmd_JZE_jze_m: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JZE_jze_m/detail.log - -cmd_DC_dc_i_of: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DC_dc_i_of/detail.log - -cmd_SRA_sra_s: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra_s/detail.log - -cmd_ADDA_adda2: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda2/detail.log - -cmd_SUBA_suba0__z: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0__z/detail.log - -cmd_XOR_xor2: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor2/detail.log - -cmd_CPA_cpa0_z: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa0_z/detail.log - -err_206: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_206/detail.log - -cmd_SRL_srl_z: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRL_srl_z/detail.log - -cmd_SLA_sla_z: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla_z/detail.log - -cmd_JUMP_jump_o: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JUMP_jump_o/detail.log - -cmd_ADDL_addl0: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0/detail.log - -cmd_OR_or1: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OR_or1/detail.log - -cmd_SLA_sla_o: Test Success 2010-12-14 01:13:20 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla_o/detail.log - -cmd_ADDL_addl0_ao: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0_ao/detail.log - -cmd_OR_or0: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_OR_or0/detail.log - -cmd_ADDL_addl0_lo: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0_lo/detail.log - -cmd_CPA_cpa0_s: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa0_s/detail.log - -cmd_ADDA_adda0__o: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0__o/detail.log - -cmd_ADDA_adda0_as0: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0_as0/detail.log - -cmd_XOR_xor0_s: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor0_s/detail.log - -err_202: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_202/detail.log - -cmd_JOV_jov_p: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JOV_jov_p/detail.log - -cmd_SUBL_subl0__o: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0__o/detail.log - -cmd_SRL_srl_s: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRL_srl_s/detail.log - -cmd_SUBA_suba0_as0: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0_as0/detail.log - -cmd_DS_ds_0: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DS_ds_0/detail.log - -cmd_SUBL_subl0_ao: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0_ao/detail.log - -cmd_ADDL_addl0_az: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0_az/detail.log - -cmd_SRL_srl_o: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRL_srl_o/detail.log - -cmd_JPL_jpl_z: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JPL_jpl_z/detail.log - -cmd_CALL_call0: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CALL_call0/detail.log - -cmd_JPL_jpl_p: Test Success 2010-12-14 01:13:21 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JPL_jpl_p/detail.log - -cmd_NOP_nop: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_NOP_nop/detail.log - -cmd_JZE_jze_o: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JZE_jze_o/detail.log - -cmd_SUBA_suba2: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba2/detail.log - -cmd_SUBL_subl0_as1: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0_as1/detail.log - -cmd_JUMP_jump_m: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JUMP_jump_m/detail.log - -cmd_CALL_call1: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CALL_call1/detail.log - -cmd_SUBL_subl1: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl1/detail.log - -cmd_SUBL_subl0_as0: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBL_subl0_as0/detail.log - -cmd_ADDA_adda0_lo: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0_lo/detail.log - -cmd_CPL_cpl0_ls: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl0_ls/detail.log - -cmd_ADDL_addl0__z: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0__z/detail.log - -cmd_CPL_cpl0_s: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl0_s/detail.log - -cmd_SRL_srl: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRL_srl/detail.log - -cmd_XOR_xor2_clear: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_XOR_xor2_clear/detail.log - -cmd_ST_st1: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ST_st1/detail.log - -cmd_ADDL_addl0_as0: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDL_addl0_as0/detail.log - -cmd_SRL_srl_oz: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRL_srl_oz/detail.log - -cmd_CPL_cpl2_s: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl2_s/detail.log - -hello: Test Success 2010-12-14 01:13:22 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/hello/detail.log - -cmd_DC_dc_c1: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_DC_dc_c1/detail.log - -cmd_CPL_cpl0_z: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPL_cpl0_z/detail.log - -cmd_JUMP_jump_z: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JUMP_jump_z/detail.log - -cmd_JZE_jze_p: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_JZE_jze_p/detail.log - -cmd_LD_ld2: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LD_ld2/detail.log - -cmd_POP_push_pop_1: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_POP_push_pop_1/detail.log - -err_208: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/err_208/detail.log - -cmd_LAD_lad1: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LAD_lad1/detail.log - -cmd_AND_and2: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_AND_and2/detail.log - -cmd_ADDA_adda0__z: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_ADDA_adda0__z/detail.log - -cmd_SRA_sra_o: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SRA_sra_o/detail.log - -cmd_CPA_cpa0_ls: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_CPA_cpa0_ls/detail.log - -cmd_SUBA_suba0_as1: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SUBA_suba0_as1/detail.log - -cmd_SLA_sla_os: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_SLA_sla_os/detail.log - -cmd_LAD_lad1_s: Test Success 2010-12-14 01:13:23 -Detail in /home/kazubito/2010_12/yacasl2/test/system/comet2/cmd_LAD_lad1_s/detail.log - diff --git a/test/system/comet2/Define.mk b/test/system/comet2/Define.mk index 65eace2..92e3b8e 100644 --- a/test/system/comet2/Define.mk +++ b/test/system/comet2/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/comet2/Define_group.mk b/test/system/comet2/Define_group.mk index f3cda2c..a572469 100644 --- a/test/system/comet2/Define_group.mk +++ b/test/system/comet2/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/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 -