X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=test%2Fintegration%2Fcomet2%2FMakefile;h=aa6807be6938d20f688023e31f1429030557a861;hb=65d7685bd755ca7810a340677417c7a0106f4792;hp=d60aaa162c70e484f5ec0b718a26b9e9394aa5c3;hpb=cc884e475afe3f48804b35336e68bce4088be61a;p=YACASL2.git

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index d60aaa1..aa6807b 100644
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -7,7 +7,7 @@
 # make prepare : すべてのテストの、想定結果を出力
 # make create  : UNITNAMEで指定されたテストを新規に作成
 TESTS = `ls | grep "^[^A-Z].*"`
-LOGFILE = TEST.log
+LOGFILE = Test.log
 
 .PHONY: all check report clean cleanall prepare create
 all: check report
@@ -42,29 +42,27 @@ prepare:
          $(MAKE) prepare -C $$target ;\
      done
 create:
-ifdef UNITNAME
+ifndef UNITNAME
+	@echo "no test created. set UNITNAME"
+else
 	@mkdir $(UNITNAME)
 	@echo 'include ../CMD.mk    # YACASL2DIR, CASL2, COMET2' >$(UNITNAME)/Makefile
-ifdef CASL2FLAG
-	@echo 'CASL2FLAG = $(CASL2FLAG)' >>$(UNITNAME)/Makefile
-else
-	@echo 'CASL2FLAG = -la' >>$(UNITNAME)/Makefile
+ifdef COMET2FLAG
+	@echo 'COMET2FLAG = $(COMET2FLAG)' >>$(UNITNAME)/Makefile
 endif
-ifdef ASDIR
-	@echo 'ASDIR = $(ASDIR)' >>$(UNITNAME)/Makefile
-else
 	@echo 'ASDIR = $$(YACASL2DIR)/as' >>$(UNITNAME)/Makefile
-endif
+	@echo 'CASL2LIBDIR = $$(YACASL2DIR)/as/casl2lib' >>$(UNITNAME)/Makefile
 ifdef ASFILE
 	@echo 'ASFILE = $(ASFILE)' >>$(UNITNAME)/Makefile
-else
-	@echo 'ASFILE = $$(ASDIR)/$(UNITNAME).casl' >>$(UNITNAME)/Makefile
 endif
+	@echo 'ASCMD = $$(CASL2) $$(CASL2FLAG) -O $(ASFILE)' >>$(UNITNAME)/Makefile
+ifdef INFILE
+	@echo 'INFILE = $$(INFILE)' >>$(UNITNAME)/Makefile
+endif
+	@echo -n 'EXECCMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile
 ifdef INFILE
-	@echo 'IN = <$(INFILE)' >>$(UNITNAME)/Makefile
+	@echo '< $(INFILE)' >>$(UNITNAME)/Makefile
 endif
-	@echo 'CMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile; \
+	@echo >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
-else
-	@echo "no test created. set UNITNAME"
 endif