comet2コマンドに、エラーテストを追加

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index 1bf6391..aa6807b 100644 (file)
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -55,9 +55,14 @@ endif
 ifdef ASFILE
        @echo 'ASFILE = $(ASFILE)' >>$(UNITNAME)/Makefile
 endif
+       @echo 'ASCMD = $$(CASL2) $$(CASL2FLAG) -O $(ASFILE)' >>$(UNITNAME)/Makefile
 ifdef INFILE
-       @echo 'INFILE = $(INFILE)' >>$(UNITNAME)/Makefile
+       @echo 'INFILE = $$(INFILE)' >>$(UNITNAME)/Makefile
 endif
-       @echo -n 'CMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile; \
+       @echo -n 'EXECCMD = $$(COMET2) $$(COMET2FLAG) $$(OBJFILE)' >>$(UNITNAME)/Makefile
+ifdef INFILE
+       @echo '< $(INFILE)' >>$(UNITNAME)/Makefile
+endif
+       @echo >>$(UNITNAME)/Makefile; \
      echo 'include ../TEST.mk' >>$(UNITNAME)/Makefile
 endif

diff --git a/test/integration/comet2/err_201/0.txt b/test/integration/comet2/err_201/0.txt
new file mode 100644 (file)
index 0000000..7fae8ed
--- /dev/null
+++ b/test/integration/comet2/err_201/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M8 a.o
+Execute error - 201: Load object file - full of COMET II memory

diff --git a/test/integration/comet2/err_201/Makefile b/test/integration/comet2/err_201/Makefile
new file mode 100644 (file)
index 0000000..a6be82c
--- /dev/null
+++ b/test/integration/comet2/err_201/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_201.casl
+ASCMD = $(CASL2) -O $(YACASL2DIR)/as/err/err_201.casl
+COMET2FLAG = -M8
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_201/a.o b/test/integration/comet2/err_201/a.o
new file mode 100644 (file)
index 0000000..eb53e2d
Binary files /dev/null and b/test/integration/comet2/err_201/a.o differ

diff --git a/test/integration/comet2/err_202/0.txt b/test/integration/comet2/err_202/0.txt
new file mode 100644 (file)
index 0000000..e6561bd
--- /dev/null
+++ b/test/integration/comet2/err_202/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M32 a.o
+Execute error - 202: SVC input - out of Input memory

diff --git a/test/integration/comet2/err_202/Makefile b/test/integration/comet2/err_202/Makefile
new file mode 100644 (file)
index 0000000..5217f0b
--- /dev/null
+++ b/test/integration/comet2/err_202/Makefile
@@ -0,0 +1,9 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_202.casl
+ASCMD = $(CASL2) -O $(YACASL2DIR)/as/err/err_202.casl
+COMET2FLAG = -M32
+INFILE = $(YACASL2DIR)/as/err/teststr.txt
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE) <$(INFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_202/a.o b/test/integration/comet2/err_202/a.o
new file mode 100644 (file)
index 0000000..79e75e9
Binary files /dev/null and b/test/integration/comet2/err_202/a.o differ

diff --git a/test/integration/comet2/err_203/0.txt b/test/integration/comet2/err_203/0.txt
new file mode 100644 (file)
index 0000000..db3a4fc
--- /dev/null
+++ b/test/integration/comet2/err_203/0.txt
@@ -0,0 +1,3 @@
+../../../../comet2 -M32 a.o
+ !<
+........Execute error - 203: SVC output - out of COMET II memory

diff --git a/test/integration/comet2/err_203/Makefile b/test/integration/comet2/err_203/Makefile
new file mode 100644 (file)
index 0000000..68a5037
--- /dev/null
+++ b/test/integration/comet2/err_203/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_203.casl
+ASCMD = $(CASL2)  -O $(YACASL2DIR)/as/err/err_203.casl
+COMET2FLAG = -M32
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_203/a.o b/test/integration/comet2/err_203/a.o
new file mode 100644 (file)
index 0000000..9d1d58e
Binary files /dev/null and b/test/integration/comet2/err_203/a.o differ

diff --git a/test/integration/comet2/err_204/0.txt b/test/integration/comet2/err_204/0.txt
new file mode 100644 (file)
index 0000000..8f1c059
--- /dev/null
+++ b/test/integration/comet2/err_204/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M8 a.o
+Execute error - 204: PR:#FFFF: Program Register (PR) - out of COMET II memory

diff --git a/test/integration/comet2/err_204/Makefile b/test/integration/comet2/err_204/Makefile
new file mode 100644 (file)
index 0000000..eedd2e5
--- /dev/null
+++ b/test/integration/comet2/err_204/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_204.casl
+ASCMD = $(CASL2)  -O $(YACASL2DIR)/as/err/err_204.casl
+COMET2FLAG = -M8
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_204/a.o b/test/integration/comet2/err_204/a.o
new file mode 100644 (file)
index 0000000..f3bfab5
Binary files /dev/null and b/test/integration/comet2/err_204/a.o differ

diff --git a/test/integration/comet2/err_205/0.txt b/test/integration/comet2/err_205/0.txt
new file mode 100644 (file)
index 0000000..77527c8
--- /dev/null
+++ b/test/integration/comet2/err_205/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M32 a.o
+Execute error - 205: PR:#000E: Stack Pointer (SP) - cannot allocate stack buffer

diff --git a/test/integration/comet2/err_205/Makefile b/test/integration/comet2/err_205/Makefile
new file mode 100644 (file)
index 0000000..e43af63
--- /dev/null
+++ b/test/integration/comet2/err_205/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_205.casl
+ASCMD = $(CASL2)  -O $(YACASL2DIR)/as/err/err_205.casl
+COMET2FLAG = -M32
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_205/a.o b/test/integration/comet2/err_205/a.o
new file mode 100644 (file)
index 0000000..5bcb38e
Binary files /dev/null and b/test/integration/comet2/err_205/a.o differ

diff --git a/test/integration/comet2/err_206/0.txt b/test/integration/comet2/err_206/0.txt
new file mode 100644 (file)
index 0000000..fe9bc6b
--- /dev/null
+++ b/test/integration/comet2/err_206/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M8 a.o
+Execute error - 206: PR:#0001: Address - out of COMET II memory

diff --git a/test/integration/comet2/err_206/Makefile b/test/integration/comet2/err_206/Makefile
new file mode 100644 (file)
index 0000000..a4daa3e
--- /dev/null
+++ b/test/integration/comet2/err_206/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_206.casl
+ASCMD = $(CASL2)  -O $(YACASL2DIR)/as/err/err_206.casl
+COMET2FLAG = -M8
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_206/a.o b/test/integration/comet2/err_206/a.o
new file mode 100644 (file)
index 0000000..2ad7b31
Binary files /dev/null and b/test/integration/comet2/err_206/a.o differ

diff --git a/test/integration/comet2/err_207/0.txt b/test/integration/comet2/err_207/0.txt
new file mode 100644 (file)
index 0000000..f0ac7f7
--- /dev/null
+++ b/test/integration/comet2/err_207/0.txt
@@ -0,0 +1,2 @@
+../../../../comet2 -M8 a.o
+Execute error - 207: PR:#0001: Stack Pointer (SP) - out of COMET II memory

diff --git a/test/integration/comet2/err_207/Makefile b/test/integration/comet2/err_207/Makefile
new file mode 100644 (file)
index 0000000..9d126fd
--- /dev/null
+++ b/test/integration/comet2/err_207/Makefile
@@ -0,0 +1,8 @@
+include ../CMD.mk    # YACASL2DIR, CASL2, COMET2
+ASDIR = $(YACASL2DIR)/as
+CASL2LIBDIR = $(YACASL2DIR)/as/casl2lib
+ASFILE = $(YACASL2DIR)/as/err/err_207.casl
+ASCMD = $(CASL2)  -O $(YACASL2DIR)/as/err/err_207.casl
+COMET2FLAG = -M8
+EXECCMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)
+include ../TEST.mk

diff --git a/test/integration/comet2/err_207/a.o b/test/integration/comet2/err_207/a.o
new file mode 100644 (file)
index 0000000..b03d6df
Binary files /dev/null and b/test/integration/comet2/err_207/a.o differ