コマンドテストの刷新

[YACASL2.git] / test / integration / casl2 / Makefile

diff --git a/test/integration/casl2/Makefile b/test/integration/casl2/Makefile
index 05bb87a..f38b79d 100644 (file)
--- a/test/integration/casl2/Makefile
+++ b/test/integration/casl2/Makefile
@@ -36,29 +36,26 @@ cleanall:
 prepare:
        @for target in $(TESTS) ; do $(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' >$(UNITNAME)/Makefile
 ifdef CASL2FLAG
        @echo 'CASL2FLAG = $(CASL2FLAG)' >>$(UNITNAME)/Makefile
-else
-       @echo 'CASL2FLAG = -la' >>$(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
 ifdef INFILE
-       @echo 'IN = <$(INFILE)' >>$(UNITNAME)/Makefile
+       @echo 'INFILE = $(INFILE)' >>$(UNITNAME)/Makefile
+endif
+       @echo -n 'CMD = $$(CASL2) $$(CASL2FLAG) $$(ASFILE)' >>$(UNITNAME)/Makefile
+ifdef INFILE
+       @echo -n ' >$$(IN)' >>$(UNITNAME)/Makefile
 endif
-       @echo 'CMD = $$(CASL2) $$(CASL2FLAG) $$(ASFILE) $$(IN)' >>$(UNITNAME)/Makefile; \
+       @echo >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
-else
-       @echo "no test created. set UNITNAME"
 endif