テストの方法を修正

diff.txtの出力形式を「diff -c」に変更
comet2のテストで、オブジェクトファイルをa.oに

diff --git a/test/TEST.mk b/test/TEST.mk
index baa0d25..f6141e2 100644 (file)
--- a/test/TEST.mk
+++ b/test/TEST.mk
@@ -21,7 +21,7 @@ cleanall: clean
      $(CMD) >>$@ 2>$(ERRFILE); \
      if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
        @echo -n "$(UNITNAME): Test " >$@; \
      if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \

diff --git a/test/integration/casl2/TEST.mk b/test/integration/casl2/TEST.mk
index 1f1dad3..bb83457 100644 (file)
--- a/test/integration/casl2/TEST.mk
+++ b/test/integration/casl2/TEST.mk
@@ -20,7 +20,7 @@ cleanall: clean
      $(CMD) >>$@ 2>$(ERRFILE); \
      if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
        @echo -n "$(UNITNAME): Test " >$@; \
      if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \

diff --git a/test/integration/comet2/CMD.mk b/test/integration/comet2/CMD.mk
index 336e8fe..904b810 100644 (file)
--- a/test/integration/comet2/CMD.mk
+++ b/test/integration/comet2/CMD.mk
@@ -1,6 +1,6 @@
 YACASL2DIR=../../../..
 UNITNAME = `pwd | xargs basename`
-OBJFILE = $(UNITNAME).o
+OBJFILE = a.o
 CASL2 = $(YACASL2DIR)/casl2
 COMET2 = $(YACASL2DIR)/comet2
 CMD = $(COMET2) $(COMET2FLAG) $(OBJFILE)

diff --git a/test/integration/comet2/Makefile b/test/integration/comet2/Makefile
index b1dd3b0..3e9bfab 100644 (file)
--- a/test/integration/comet2/Makefile
+++ b/test/integration/comet2/Makefile
@@ -18,7 +18,7 @@ check:
      done
 $(LOGFILE):
        @for target in $(TESTS); do \
-         cat <$$target/report.txt >>$(LOGFILE) 2>/dev/null || echo "Failure:" $$target "no report" >>$(LOGFILE); \
+         if test -s $^; then cat <$$target/report.txt >>$(LOGFILE); else echo "Failure:" $$target "no report" >>$(LOGFILE); fi; \
      done
 report: $(LOGFILE)
        @success=`grep "Success" $(LOGFILE) | wc -l`; \

diff --git a/test/integration/comet2/TEST.mk b/test/integration/comet2/TEST.mk
index d2174d7..3ec7fed 100644 (file)
--- a/test/integration/comet2/TEST.mk
+++ b/test/integration/comet2/TEST.mk
@@ -15,13 +15,13 @@ clean:
 cleanall: clean
        @rm -f 0.txt $(OBJFILE)
 $(OBJFILE): $(CASL2) $(ASFILE)
-       @$(CASL2) $(CASL2FLAG) -O$(OBJFILE) $(ASFILE) 2>$(ERRFILE)
+       @$(CASL2) $(CASL2FLAG) -O $(ASFILE) 2>$(ERRFILE)
 0.txt 1.txt: $(COMET2) $(OBJFILE)
        @echo $(CMD) >$@; \
      $(CMD) >>$@ 2>$(ERRFILE); \
      if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
        @echo -n "$(UNITNAME): Test " >$@; \
      if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \

diff --git a/test/integration/comet2/abs_call/0.txt b/test/integration/comet2/abs_call/0.txt
index a8219d6..c5ec326 100644 (file)
--- a/test/integration/comet2/abs_call/0.txt
+++ b/test/integration/comet2/abs_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 abs_call.o
+../../../../comet2 a.o
 12
 12
 1

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

diff --git a/test/integration/comet2/abs_call/abs_call.o b/test/integration/comet2/abs_call/abs_call.o
deleted file mode 100644 (file)
index 483c080..0000000
Binary files a/test/integration/comet2/abs_call/abs_call.o and /dev/null differ

diff --git a/test/integration/comet2/adda0/0.txt b/test/integration/comet2/adda0/0.txt
index 8420ae7..9faf9b8 100644 (file)
--- a/test/integration/comet2/adda0/0.txt
+++ b/test/integration/comet2/adda0/0.txt
@@ -1 +1 @@
-../../../../comet2 adda0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/adda0/adda0.o b/test/integration/comet2/adda0/a.o
similarity index 100%
rename from test/integration/comet2/adda0/adda0.o
rename to test/integration/comet2/adda0/a.o

diff --git a/test/integration/comet2/adda1/0.txt b/test/integration/comet2/adda1/0.txt
index 3cd03d5..9faf9b8 100644 (file)
--- a/test/integration/comet2/adda1/0.txt
+++ b/test/integration/comet2/adda1/0.txt
@@ -1 +1 @@
-../../../../comet2 adda1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/adda1/adda1.o b/test/integration/comet2/adda1/a.o
similarity index 100%
rename from test/integration/comet2/adda1/adda1.o
rename to test/integration/comet2/adda1/a.o

diff --git a/test/integration/comet2/adda_overflow/0.txt b/test/integration/comet2/adda_overflow/0.txt
index f656d4d..9faf9b8 100644 (file)
--- a/test/integration/comet2/adda_overflow/0.txt
+++ b/test/integration/comet2/adda_overflow/0.txt
@@ -1 +1 @@
-../../../../comet2 adda_overflow.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/adda_overflow/adda_overflow.o b/test/integration/comet2/adda_overflow/a.o
similarity index 100%
rename from test/integration/comet2/adda_overflow/adda_overflow.o
rename to test/integration/comet2/adda_overflow/a.o

diff --git a/test/integration/comet2/addl/0.txt b/test/integration/comet2/addl/0.txt
index da4c46e..9faf9b8 100644 (file)
--- a/test/integration/comet2/addl/0.txt
+++ b/test/integration/comet2/addl/0.txt
@@ -1 +1 @@
-../../../../comet2 addl.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/addl/addl.o b/test/integration/comet2/addl/a.o
similarity index 100%
rename from test/integration/comet2/addl/addl.o
rename to test/integration/comet2/addl/a.o

diff --git a/test/integration/comet2/addl_overflow/0.txt b/test/integration/comet2/addl_overflow/0.txt
index d1f5171..9faf9b8 100644 (file)
--- a/test/integration/comet2/addl_overflow/0.txt
+++ b/test/integration/comet2/addl_overflow/0.txt
@@ -1 +1 @@
-../../../../comet2 addl_overflow.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/addl_overflow/addl_overflow.o b/test/integration/comet2/addl_overflow/a.o
similarity index 100%
rename from test/integration/comet2/addl_overflow/addl_overflow.o
rename to test/integration/comet2/addl_overflow/a.o

diff --git a/test/integration/comet2/and0/0.txt b/test/integration/comet2/and0/0.txt
index b19679f..9faf9b8 100644 (file)
--- a/test/integration/comet2/and0/0.txt
+++ b/test/integration/comet2/and0/0.txt
@@ -1 +1 @@
-../../../../comet2 and0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/and0/and0.o b/test/integration/comet2/and0/a.o
similarity index 100%
rename from test/integration/comet2/and0/and0.o
rename to test/integration/comet2/and0/a.o

diff --git a/test/integration/comet2/and1/0.txt b/test/integration/comet2/and1/0.txt
index 4c72b26..9faf9b8 100644 (file)
--- a/test/integration/comet2/and1/0.txt
+++ b/test/integration/comet2/and1/0.txt
@@ -1 +1 @@
-../../../../comet2 and1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/and1/and1.o b/test/integration/comet2/and1/a.o
similarity index 100%
rename from test/integration/comet2/and1/and1.o
rename to test/integration/comet2/and1/a.o

diff --git a/test/integration/comet2/and2/0.txt b/test/integration/comet2/and2/0.txt
index 0ea1030..9faf9b8 100644 (file)
--- a/test/integration/comet2/and2/0.txt
+++ b/test/integration/comet2/and2/0.txt
@@ -1 +1 @@
-../../../../comet2 and2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/and2/and2.o b/test/integration/comet2/and2/a.o
similarity index 100%
rename from test/integration/comet2/and2/and2.o
rename to test/integration/comet2/and2/a.o

diff --git a/test/integration/comet2/and3/0.txt b/test/integration/comet2/and3/0.txt
index efa4d33..9faf9b8 100644 (file)
--- a/test/integration/comet2/and3/0.txt
+++ b/test/integration/comet2/and3/0.txt
@@ -1 +1 @@
-../../../../comet2 and3.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/and3/and3.o b/test/integration/comet2/and3/a.o
similarity index 100%
rename from test/integration/comet2/and3/and3.o
rename to test/integration/comet2/and3/a.o

diff --git a/test/integration/comet2/binout/0.txt b/test/integration/comet2/binout/0.txt
index 6a54f7f..df48c3d 100644 (file)
--- a/test/integration/comet2/binout/0.txt
+++ b/test/integration/comet2/binout/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 binout.o
+../../../../comet2 a.o
 0
 1
 100111001101

diff --git a/test/integration/comet2/binout/binout.o b/test/integration/comet2/binout/a.o
similarity index 100%
rename from test/integration/comet2/binout/binout.o
rename to test/integration/comet2/binout/a.o

diff --git a/test/integration/comet2/call0/0.txt b/test/integration/comet2/call0/0.txt
index 63ea10b..9faf9b8 100644 (file)
--- a/test/integration/comet2/call0/0.txt
+++ b/test/integration/comet2/call0/0.txt
@@ -1 +1 @@
-../../../../comet2 call0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/call0/call0.o b/test/integration/comet2/call0/a.o
similarity index 100%
rename from test/integration/comet2/call0/call0.o
rename to test/integration/comet2/call0/a.o

diff --git a/test/integration/comet2/call1/0.txt b/test/integration/comet2/call1/0.txt
index fd8283f..9faf9b8 100644 (file)
--- a/test/integration/comet2/call1/0.txt
+++ b/test/integration/comet2/call1/0.txt
@@ -1 +1 @@
-../../../../comet2 call1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/call1/call1.o b/test/integration/comet2/call1/a.o
similarity index 100%
rename from test/integration/comet2/call1/call1.o
rename to test/integration/comet2/call1/a.o

diff --git a/test/integration/comet2/call2/0.txt b/test/integration/comet2/call2/0.txt
index a0cc8ef..9faf9b8 100644 (file)
--- a/test/integration/comet2/call2/0.txt
+++ b/test/integration/comet2/call2/0.txt
@@ -1 +1 @@
-../../../../comet2 call2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/call2/call2.o b/test/integration/comet2/call2/a.o
similarity index 100%
rename from test/integration/comet2/call2/call2.o
rename to test/integration/comet2/call2/a.o

diff --git a/test/integration/comet2/count_call/0.txt b/test/integration/comet2/count_call/0.txt
index e638c3e..f1a15f0 100644 (file)
--- a/test/integration/comet2/count_call/0.txt
+++ b/test/integration/comet2/count_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 count_call.o
+../../../../comet2 a.o
 0
 1
 1

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

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

diff --git a/test/integration/comet2/cpa1/0.txt b/test/integration/comet2/cpa1/0.txt
index d1fe1c1..9faf9b8 100644 (file)
--- a/test/integration/comet2/cpa1/0.txt
+++ b/test/integration/comet2/cpa1/0.txt
@@ -1 +1 @@
-../../../../comet2 cpa1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/cpa1/cpa1.o b/test/integration/comet2/cpa1/a.o
similarity index 100%
rename from test/integration/comet2/cpa1/cpa1.o
rename to test/integration/comet2/cpa1/a.o

diff --git a/test/integration/comet2/dc_overflow/0.txt b/test/integration/comet2/dc_overflow/0.txt
index 80c1f2d..9faf9b8 100644 (file)
--- a/test/integration/comet2/dc_overflow/0.txt
+++ b/test/integration/comet2/dc_overflow/0.txt
@@ -1 +1 @@
-../../../../comet2 dc_overflow.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/dc_overflow/dc_overflow.o b/test/integration/comet2/dc_overflow/a.o
similarity index 100%
rename from test/integration/comet2/dc_overflow/dc_overflow.o
rename to test/integration/comet2/dc_overflow/a.o

diff --git a/test/integration/comet2/dc_spc/0.txt b/test/integration/comet2/dc_spc/0.txt
index 67e29a5..c29b217 100644 (file)
--- a/test/integration/comet2/dc_spc/0.txt
+++ b/test/integration/comet2/dc_spc/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 dc_spc.o
+../../../../comet2 a.o
  

diff --git a/test/integration/comet2/dc_spc/dc_spc.o b/test/integration/comet2/dc_spc/a.o
similarity index 100%
rename from test/integration/comet2/dc_spc/dc_spc.o
rename to test/integration/comet2/dc_spc/a.o

diff --git a/test/integration/comet2/divl0_call/0.txt b/test/integration/comet2/divl0_call/0.txt
index f1c1376..64cfd06 100644 (file)
--- a/test/integration/comet2/divl0_call/0.txt
+++ b/test/integration/comet2/divl0_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 divl0_call.o
+../../../../comet2 a.o
 --------------------
 100
 0

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

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

diff --git a/test/integration/comet2/divl1_call/0.txt b/test/integration/comet2/divl1_call/0.txt
index bfdfe4f..64cfd06 100644 (file)
--- a/test/integration/comet2/divl1_call/0.txt
+++ b/test/integration/comet2/divl1_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 divl1_call.o
+../../../../comet2 a.o
 --------------------
 100
 0

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

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

diff --git a/test/integration/comet2/ds_0/0.txt b/test/integration/comet2/ds_0/0.txt
index b22242e..9faf9b8 100644 (file)
--- a/test/integration/comet2/ds_0/0.txt
+++ b/test/integration/comet2/ds_0/0.txt
@@ -1 +1 @@
-../../../../comet2 ds_0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ds_0/ds_0.o b/test/integration/comet2/ds_0/a.o
similarity index 100%
rename from test/integration/comet2/ds_0/ds_0.o
rename to test/integration/comet2/ds_0/a.o

diff --git a/test/integration/comet2/fib_outl/0.txt b/test/integration/comet2/fib_outl/0.txt
index 58f7bce..4d4d972 100644 (file)
--- a/test/integration/comet2/fib_outl/0.txt
+++ b/test/integration/comet2/fib_outl/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 fib_outl.o
+../../../../comet2 a.o
 0
 1
 1

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

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

diff --git a/test/integration/comet2/floatedit/0.txt b/test/integration/comet2/floatedit/0.txt
index 622e7ce..9b53a91 100644 (file)
--- a/test/integration/comet2/floatedit/0.txt
+++ b/test/integration/comet2/floatedit/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 floatedit.o
+../../../../comet2 a.o
 input error!
 input error!
 input error!

diff --git a/test/integration/comet2/floatedit/floatedit.o b/test/integration/comet2/floatedit/a.o
similarity index 100%
rename from test/integration/comet2/floatedit/floatedit.o
rename to test/integration/comet2/floatedit/a.o

diff --git a/test/integration/comet2/hanoi/0.txt b/test/integration/comet2/hanoi/0.txt
deleted file mode 100644 (file)
index 8422687..0000000
--- a/test/integration/comet2/hanoi/0.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-../../../../comet2 hanoi.o
-from A to C
-from A to B
-from C to B
-from A to C
-from B to A
-from B to C
-from A to C

diff --git a/test/integration/comet2/hanoi/Makefile b/test/integration/comet2/hanoi/Makefile
deleted file mode 100644 (file)
index ab136a1..0000000
--- a/test/integration/comet2/hanoi/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-include ../CMD.mk    # YACASL2DIR, CASL2
-ASDIR = $(YACASL2DIR)/as/FUNC
-ASFILE = $(ASDIR)/hanoi.casl
-include ../TEST.mk

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

diff --git a/test/integration/comet2/hello/0.txt b/test/integration/comet2/hello/0.txt
index 1f81a04..420d1d3 100644 (file)
--- a/test/integration/comet2/hello/0.txt
+++ b/test/integration/comet2/hello/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 hello.o
+../../../../comet2 a.o
 Hello, World!

diff --git a/test/integration/comet2/hello/hello.o b/test/integration/comet2/hello/a.o
similarity index 100%
rename from test/integration/comet2/hello/hello.o
rename to test/integration/comet2/hello/a.o

diff --git a/test/integration/comet2/iotest/0.txt b/test/integration/comet2/iotest/0.txt
index 561c520..638b171 100644 (file)
--- a/test/integration/comet2/iotest/0.txt
+++ b/test/integration/comet2/iotest/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 iotest.o
+../../../../comet2 a.o
 LET'S START. TYPE IN
 YOU TYPED
 aaaaaaaaaaaaaaaaaaaa

diff --git a/test/integration/comet2/iotest/iotest.o b/test/integration/comet2/iotest/a.o
similarity index 100%
rename from test/integration/comet2/iotest/iotest.o
rename to test/integration/comet2/iotest/a.o

diff --git a/test/integration/comet2/lad0/0.txt b/test/integration/comet2/lad0/0.txt
index b382fd6..9faf9b8 100644 (file)
--- a/test/integration/comet2/lad0/0.txt
+++ b/test/integration/comet2/lad0/0.txt
@@ -1 +1 @@
-../../../../comet2 lad0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/lad0/lad0.o b/test/integration/comet2/lad0/a.o
similarity index 100%
rename from test/integration/comet2/lad0/lad0.o
rename to test/integration/comet2/lad0/a.o

diff --git a/test/integration/comet2/lad1/0.txt b/test/integration/comet2/lad1/0.txt
index 26de6e4..9faf9b8 100644 (file)
--- a/test/integration/comet2/lad1/0.txt
+++ b/test/integration/comet2/lad1/0.txt
@@ -1 +1 @@
-../../../../comet2 lad1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/lad1/lad1.o b/test/integration/comet2/lad1/a.o
similarity index 100%
rename from test/integration/comet2/lad1/lad1.o
rename to test/integration/comet2/lad1/a.o

diff --git a/test/integration/comet2/lad2/0.txt b/test/integration/comet2/lad2/0.txt
index 72a596b..9faf9b8 100644 (file)
--- a/test/integration/comet2/lad2/0.txt
+++ b/test/integration/comet2/lad2/0.txt
@@ -1 +1 @@
-../../../../comet2 lad2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/lad2/lad2.o b/test/integration/comet2/lad2/a.o
similarity index 100%
rename from test/integration/comet2/lad2/lad2.o
rename to test/integration/comet2/lad2/a.o

diff --git a/test/integration/comet2/lad3/0.txt b/test/integration/comet2/lad3/0.txt
index 1468303..9faf9b8 100644 (file)
--- a/test/integration/comet2/lad3/0.txt
+++ b/test/integration/comet2/lad3/0.txt
@@ -1 +1 @@
-../../../../comet2 lad3.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/lad3/lad3.o b/test/integration/comet2/lad3/a.o
similarity index 100%
rename from test/integration/comet2/lad3/lad3.o
rename to test/integration/comet2/lad3/a.o

diff --git a/test/integration/comet2/ld0/0.txt b/test/integration/comet2/ld0/0.txt
index a20e9d4..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld0/0.txt
+++ b/test/integration/comet2/ld0/0.txt
@@ -1 +1 @@
-../../../../comet2 ld0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld0/ld0.o b/test/integration/comet2/ld0/a.o
similarity index 100%
rename from test/integration/comet2/ld0/ld0.o
rename to test/integration/comet2/ld0/a.o

diff --git a/test/integration/comet2/ld1/0.txt b/test/integration/comet2/ld1/0.txt
index d2e6659..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld1/0.txt
+++ b/test/integration/comet2/ld1/0.txt
@@ -1 +1 @@
-../../../../comet2 ld1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld1/ld1.o b/test/integration/comet2/ld1/a.o
similarity index 100%
rename from test/integration/comet2/ld1/ld1.o
rename to test/integration/comet2/ld1/a.o

diff --git a/test/integration/comet2/ld2/0.txt b/test/integration/comet2/ld2/0.txt
index 5f59e83..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld2/0.txt
+++ b/test/integration/comet2/ld2/0.txt
@@ -1 +1 @@
-../../../../comet2 ld2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld2/ld2.o b/test/integration/comet2/ld2/a.o
similarity index 100%
rename from test/integration/comet2/ld2/ld2.o
rename to test/integration/comet2/ld2/a.o

diff --git a/test/integration/comet2/ld3/0.txt b/test/integration/comet2/ld3/0.txt
index 1a2fd81..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld3/0.txt
+++ b/test/integration/comet2/ld3/0.txt
@@ -1 +1 @@
-../../../../comet2 ld3.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld3/ld3.o b/test/integration/comet2/ld3/a.o
similarity index 100%
rename from test/integration/comet2/ld3/ld3.o
rename to test/integration/comet2/ld3/a.o

diff --git a/test/integration/comet2/ld4/0.txt b/test/integration/comet2/ld4/0.txt
index bf15a01..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld4/0.txt
+++ b/test/integration/comet2/ld4/0.txt
@@ -1 +1 @@
-../../../../comet2 ld4.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld4/ld4.o b/test/integration/comet2/ld4/a.o
similarity index 100%
rename from test/integration/comet2/ld4/ld4.o
rename to test/integration/comet2/ld4/a.o

diff --git a/test/integration/comet2/ld5/0.txt b/test/integration/comet2/ld5/0.txt
index ccc345f..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld5/0.txt
+++ b/test/integration/comet2/ld5/0.txt
@@ -1 +1 @@
-../../../../comet2 ld5.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld5/ld5.o b/test/integration/comet2/ld5/a.o
similarity index 100%
rename from test/integration/comet2/ld5/ld5.o
rename to test/integration/comet2/ld5/a.o

diff --git a/test/integration/comet2/ld_loop/0.txt b/test/integration/comet2/ld_loop/0.txt
index 02b0a1c..9faf9b8 100644 (file)
--- a/test/integration/comet2/ld_loop/0.txt
+++ b/test/integration/comet2/ld_loop/0.txt
@@ -1 +1 @@
-../../../../comet2 ld_loop.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/ld_loop/ld_loop.o b/test/integration/comet2/ld_loop/a.o
similarity index 100%
rename from test/integration/comet2/ld_loop/ld_loop.o
rename to test/integration/comet2/ld_loop/a.o

diff --git a/test/integration/comet2/literal_spc/0.txt b/test/integration/comet2/literal_spc/0.txt
index bb21b9f..c29b217 100644 (file)
--- a/test/integration/comet2/literal_spc/0.txt
+++ b/test/integration/comet2/literal_spc/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 literal_spc.o
+../../../../comet2 a.o
  

diff --git a/test/integration/comet2/literal_spc/literal_spc.o b/test/integration/comet2/literal_spc/a.o
similarity index 100%
rename from test/integration/comet2/literal_spc/literal_spc.o
rename to test/integration/comet2/literal_spc/a.o

diff --git a/test/integration/comet2/literalstr/0.txt b/test/integration/comet2/literalstr/0.txt
index adb8830..9faf9b8 100644 (file)
--- a/test/integration/comet2/literalstr/0.txt
+++ b/test/integration/comet2/literalstr/0.txt
@@ -1 +1 @@
-../../../../comet2 literalstr.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/literalstr/literalstr.o b/test/integration/comet2/literalstr/a.o
similarity index 100%
rename from test/integration/comet2/literalstr/literalstr.o
rename to test/integration/comet2/literalstr/a.o

diff --git a/test/integration/comet2/minim_call/0.txt b/test/integration/comet2/minim_call/0.txt
index dd71b80..4f01b01 100644 (file)
--- a/test/integration/comet2/minim_call/0.txt
+++ b/test/integration/comet2/minim_call/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 minim_call.o
+../../../../comet2 a.o
 -39

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

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

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

diff --git a/test/integration/comet2/mula0_call/mula0_call.o b/test/integration/comet2/mula0_call/mula0_call.o
deleted file mode 100644 (file)
index 16ac984..0000000
Binary files a/test/integration/comet2/mula0_call/mula0_call.o and /dev/null differ

diff --git a/test/integration/comet2/mula1_call/0.txt b/test/integration/comet2/mula1_call/0.txt
index 1d9e83b..3b447a6 100644 (file)
--- a/test/integration/comet2/mula1_call/0.txt
+++ b/test/integration/comet2/mula1_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 -M640 mula1_call.o
+../../../../comet2 -M640 a.o
 --------------------
 0
 0

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

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

diff --git a/test/integration/comet2/mull0_call/0.txt b/test/integration/comet2/mull0_call/0.txt
index 7b2dc2b..edf1ed2 100644 (file)
--- a/test/integration/comet2/mull0_call/0.txt
+++ b/test/integration/comet2/mull0_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 mull0_call.o
+../../../../comet2 a.o
 --------------------
 0
 0

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

diff --git a/test/integration/comet2/mull0_call/mull0_call.o b/test/integration/comet2/mull0_call/mull0_call.o
deleted file mode 100644 (file)
index 7bd0798..0000000
Binary files a/test/integration/comet2/mull0_call/mull0_call.o and /dev/null differ

diff --git a/test/integration/comet2/mull1_call/0.txt b/test/integration/comet2/mull1_call/0.txt
index 4cf89f5..edf1ed2 100644 (file)
--- a/test/integration/comet2/mull1_call/0.txt
+++ b/test/integration/comet2/mull1_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 mull1_call.o
+../../../../comet2 a.o
 --------------------
 0
 0

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

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

diff --git a/test/integration/comet2/out0/0.txt b/test/integration/comet2/out0/0.txt
index 76c7837..c1e27a9 100644 (file)
--- a/test/integration/comet2/out0/0.txt
+++ b/test/integration/comet2/out0/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 out0.o
+../../../../comet2 a.o
 0

diff --git a/test/integration/comet2/out0/out0.o b/test/integration/comet2/out0/a.o
similarity index 100%
rename from test/integration/comet2/out0/out0.o
rename to test/integration/comet2/out0/a.o

diff --git a/test/integration/comet2/out1/0.txt b/test/integration/comet2/out1/0.txt
index 61557e2..d261ab8 100644 (file)
--- a/test/integration/comet2/out1/0.txt
+++ b/test/integration/comet2/out1/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 out1.o
+../../../../comet2 a.o
 aaaa
 bc
 asqwerty111111.

diff --git a/test/integration/comet2/out1/out1.o b/test/integration/comet2/out1/a.o
similarity index 100%
rename from test/integration/comet2/out1/out1.o
rename to test/integration/comet2/out1/a.o

diff --git a/test/integration/comet2/outa_call/0.txt b/test/integration/comet2/outa_call/0.txt
index b1dbe57..aa56b62 100644 (file)
--- a/test/integration/comet2/outa_call/0.txt
+++ b/test/integration/comet2/outa_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 outa_call.o
+../../../../comet2 a.o
 0
 1
 2

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

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

diff --git a/test/integration/comet2/outb_call/0.txt b/test/integration/comet2/outb_call/0.txt
index 59fcefb..ee5fdd2 100644 (file)
--- a/test/integration/comet2/outb_call/0.txt
+++ b/test/integration/comet2/outb_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 outb_call.o
+../../../../comet2 a.o
 0000000000000000
 0000000000000001
 0000000000000010

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

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

diff --git a/test/integration/comet2/outd_q15_call/0.txt b/test/integration/comet2/outd_q15_call/0.txt
index 081fcc7..0ab2a25 100644 (file)
--- a/test/integration/comet2/outd_q15_call/0.txt
+++ b/test/integration/comet2/outd_q15_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 outd_q15_call.o
+../../../../comet2 a.o
 0.999969482421875
 0.5
 0.25

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

diff --git a/test/integration/comet2/outd_q15_call/outd_q15_call.o b/test/integration/comet2/outd_q15_call/outd_q15_call.o
deleted file mode 100644 (file)
index 61a9bdc..0000000
Binary files a/test/integration/comet2/outd_q15_call/outd_q15_call.o and /dev/null differ

diff --git a/test/integration/comet2/outl_call/0.txt b/test/integration/comet2/outl_call/0.txt
index 1c9d646..d94db6d 100644 (file)
--- a/test/integration/comet2/outl_call/0.txt
+++ b/test/integration/comet2/outl_call/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 outl_call.o
+../../../../comet2 a.o
 0
 1
 2

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

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

diff --git a/test/integration/comet2/ptn1/0.txt b/test/integration/comet2/ptn1/0.txt
index 1e668e0..b31e992 100644 (file)
--- a/test/integration/comet2/ptn1/0.txt
+++ b/test/integration/comet2/ptn1/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 ptn1.o
+../../../../comet2 a.o
 1111111111100000

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

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

diff --git a/test/integration/comet2/ptn2/0.txt b/test/integration/comet2/ptn2/0.txt
index 01dbde4..ff921e9 100644 (file)
--- a/test/integration/comet2/ptn2/0.txt
+++ b/test/integration/comet2/ptn2/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 ptn2.o
+../../../../comet2 a.o
 0000000000011111

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

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

diff --git a/test/integration/comet2/ptn3/0.txt b/test/integration/comet2/ptn3/0.txt
index eec80ac..06b8df7 100644 (file)
--- a/test/integration/comet2/ptn3/0.txt
+++ b/test/integration/comet2/ptn3/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 ptn3.o
+../../../../comet2 a.o
 0000000000100000

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

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

diff --git a/test/integration/comet2/ptn4/0.txt b/test/integration/comet2/ptn4/0.txt
index 58b4af4..74db298 100644 (file)
--- a/test/integration/comet2/ptn4/0.txt
+++ b/test/integration/comet2/ptn4/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 ptn4.o
+../../../../comet2 a.o
 1111100000011111

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

diff --git a/test/integration/comet2/ptn4/ptn4.o b/test/integration/comet2/ptn4/ptn4.o
deleted file mode 100644 (file)
index 86c9d5a..0000000
Binary files a/test/integration/comet2/ptn4/ptn4.o and /dev/null differ

diff --git a/test/integration/comet2/pushpop/0.txt b/test/integration/comet2/pushpop/0.txt
index 721c650..9faf9b8 100644 (file)
--- a/test/integration/comet2/pushpop/0.txt
+++ b/test/integration/comet2/pushpop/0.txt
@@ -1 +1 @@
-../../../../comet2 pushpop.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/pushpop/pushpop.o b/test/integration/comet2/pushpop/a.o
similarity index 100%
rename from test/integration/comet2/pushpop/pushpop.o
rename to test/integration/comet2/pushpop/a.o

diff --git a/test/integration/comet2/rev_call/0.txt b/test/integration/comet2/rev_call/0.txt
index a1a31cf..e3ff4d1 100644 (file)
--- a/test/integration/comet2/rev_call/0.txt
+++ b/test/integration/comet2/rev_call/0.txt
@@ -1,3 +1,3 @@
-../../../../comet2 rev_call.o
+../../../../comet2 a.o
 12345
 54321

diff --git a/test/integration/comet2/rev_call/rev_call.o b/test/integration/comet2/rev_call/a.o
similarity index 100%
rename from test/integration/comet2/rev_call/rev_call.o
rename to test/integration/comet2/rev_call/a.o

diff --git a/test/integration/comet2/sla2/0.txt b/test/integration/comet2/sla2/0.txt
index b276a2e..9faf9b8 100644 (file)
--- a/test/integration/comet2/sla2/0.txt
+++ b/test/integration/comet2/sla2/0.txt
@@ -1 +1 @@
-../../../../comet2 sla2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/sla2/sla2.o b/test/integration/comet2/sla2/a.o
similarity index 100%
rename from test/integration/comet2/sla2/sla2.o
rename to test/integration/comet2/sla2/a.o

diff --git a/test/integration/comet2/sra2/0.txt b/test/integration/comet2/sra2/0.txt
index 01fe12f..9faf9b8 100644 (file)
--- a/test/integration/comet2/sra2/0.txt
+++ b/test/integration/comet2/sra2/0.txt
@@ -1 +1 @@
-../../../../comet2 sra2.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/sra2/sra2.o b/test/integration/comet2/sra2/a.o
similarity index 100%
rename from test/integration/comet2/sra2/sra2.o
rename to test/integration/comet2/sra2/a.o

diff --git a/test/integration/comet2/sra3/0.txt b/test/integration/comet2/sra3/0.txt
index 2de3d0a..9faf9b8 100644 (file)
--- a/test/integration/comet2/sra3/0.txt
+++ b/test/integration/comet2/sra3/0.txt
@@ -1 +1 @@
-../../../../comet2 sra3.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/sra3/sra3.o b/test/integration/comet2/sra3/a.o
similarity index 100%
rename from test/integration/comet2/sra3/sra3.o
rename to test/integration/comet2/sra3/a.o

diff --git a/test/integration/comet2/sra4/0.txt b/test/integration/comet2/sra4/0.txt
index 90a81ec..9faf9b8 100644 (file)
--- a/test/integration/comet2/sra4/0.txt
+++ b/test/integration/comet2/sra4/0.txt
@@ -1 +1 @@
-../../../../comet2 sra4.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/sra4/sra4.o b/test/integration/comet2/sra4/a.o
similarity index 100%
rename from test/integration/comet2/sra4/sra4.o
rename to test/integration/comet2/sra4/a.o

diff --git a/test/integration/comet2/st0/0.txt b/test/integration/comet2/st0/0.txt
index ea37d6b..9faf9b8 100644 (file)
--- a/test/integration/comet2/st0/0.txt
+++ b/test/integration/comet2/st0/0.txt
@@ -1 +1 @@
-../../../../comet2 st0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/st0/st0.o b/test/integration/comet2/st0/a.o
similarity index 100%
rename from test/integration/comet2/st0/st0.o
rename to test/integration/comet2/st0/a.o

diff --git a/test/integration/comet2/st1/0.txt b/test/integration/comet2/st1/0.txt
index 2a85e99..9faf9b8 100644 (file)
--- a/test/integration/comet2/st1/0.txt
+++ b/test/integration/comet2/st1/0.txt
@@ -1 +1 @@
-../../../../comet2 st1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/st1/st1.o b/test/integration/comet2/st1/a.o
similarity index 100%
rename from test/integration/comet2/st1/st1.o
rename to test/integration/comet2/st1/a.o

diff --git a/test/integration/comet2/sum_10_T/0.txt b/test/integration/comet2/sum_10_T/0.txt
index fdd6688..40b54c0 100644 (file)
--- a/test/integration/comet2/sum_10_T/0.txt
+++ b/test/integration/comet2/sum_10_T/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 -T sum_10_T.o
+../../../../comet2 -T a.o
 
 Executing machine codes
 #0000: Register::::

diff --git a/test/integration/comet2/sum_10_T/sum_10_T.o b/test/integration/comet2/sum_10_T/a.o
similarity index 100%
rename from test/integration/comet2/sum_10_T/sum_10_T.o
rename to test/integration/comet2/sum_10_T/a.o

diff --git a/test/integration/comet2/sum_10_h/0.txt b/test/integration/comet2/sum_10_h/0.txt
index 257d442..45a29f0 100644 (file)
--- a/test/integration/comet2/sum_10_h/0.txt
+++ b/test/integration/comet2/sum_10_h/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 -tdh sum_10_h.o
+../../../../comet2 -tdh a.o
 Usage: ../../../../comet2 [-tTdh] [-M <memorysize>] [-C <clocks>] FILE

diff --git a/test/integration/comet2/sum_10_h/sum_10_h.o b/test/integration/comet2/sum_10_h/a.o
similarity index 100%
rename from test/integration/comet2/sum_10_h/sum_10_h.o
rename to test/integration/comet2/sum_10_h/a.o

diff --git a/test/integration/comet2/sum_10_opterr/0.txt b/test/integration/comet2/sum_10_opterr/0.txt
index f82f4b5..09653f3 100644 (file)
--- a/test/integration/comet2/sum_10_opterr/0.txt
+++ b/test/integration/comet2/sum_10_opterr/0.txt
@@ -1,3 +1,3 @@
-../../../../comet2 -s sum_10_opterr.o
+../../../../comet2 -s a.o
 ../../../../comet2: invalid option -- s
 Usage: ../../../../comet2 [-tTdh] [-M <memorysize>] [-C <clocks>] FILE

diff --git a/test/integration/comet2/sum_10_opterr/sum_10_opterr.o b/test/integration/comet2/sum_10_opterr/a.o
similarity index 100%
rename from test/integration/comet2/sum_10_opterr/sum_10_opterr.o
rename to test/integration/comet2/sum_10_opterr/a.o

diff --git a/test/integration/comet2/sum_10_t/0.txt b/test/integration/comet2/sum_10_t/0.txt
index b55fd71..92724ec 100644 (file)
--- a/test/integration/comet2/sum_10_t/0.txt
+++ b/test/integration/comet2/sum_10_t/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 -t sum_10_t.o
+../../../../comet2 -t a.o
 
 Executing machine codes
 #0000: Register::::

diff --git a/test/integration/comet2/sum_10_t/sum_10_t.o b/test/integration/comet2/sum_10_t/a.o
similarity index 100%
rename from test/integration/comet2/sum_10_t/sum_10_t.o
rename to test/integration/comet2/sum_10_t/a.o

diff --git a/test/integration/comet2/sum_10_td/0.txt b/test/integration/comet2/sum_10_td/0.txt
index 88c4db6..c31c933 100644 (file)
--- a/test/integration/comet2/sum_10_td/0.txt
+++ b/test/integration/comet2/sum_10_td/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 -td sum_10_td.o
+../../../../comet2 -td a.o
 
 Executing machine codes
 #0000: Register::::

diff --git a/test/integration/comet2/sum_10_td/sum_10_td.o b/test/integration/comet2/sum_10_td/a.o
similarity index 100%
rename from test/integration/comet2/sum_10_td/sum_10_td.o
rename to test/integration/comet2/sum_10_td/a.o

diff --git a/test/integration/comet2/sum_call/0.txt b/test/integration/comet2/sum_call/0.txt
index b00220f..f0762a0 100644 (file)
--- a/test/integration/comet2/sum_call/0.txt
+++ b/test/integration/comet2/sum_call/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 sum_call.o
+../../../../comet2 a.o
 65341

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

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

diff --git a/test/integration/comet2/summary/0.txt b/test/integration/comet2/summary/0.txt
index 6111897..bc62173 100644 (file)
--- a/test/integration/comet2/summary/0.txt
+++ b/test/integration/comet2/summary/0.txt
@@ -1,4 +1,4 @@
-../../../../comet2 summary.o
+../../../../comet2 a.o
  *                                              
  *     *  *     *                               
  *  *  *  *     *  *                       *    

diff --git a/test/integration/comet2/summary/summary.o b/test/integration/comet2/summary/a.o
similarity index 100%
rename from test/integration/comet2/summary/summary.o
rename to test/integration/comet2/summary/a.o

diff --git a/test/integration/comet2/svc2/0.txt b/test/integration/comet2/svc2/0.txt
index 440a664..c1e27a9 100644 (file)
--- a/test/integration/comet2/svc2/0.txt
+++ b/test/integration/comet2/svc2/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 svc2.o
+../../../../comet2 a.o
 0

diff --git a/test/integration/comet2/svc2/svc2.o b/test/integration/comet2/svc2/a.o
similarity index 100%
rename from test/integration/comet2/svc2/svc2.o
rename to test/integration/comet2/svc2/a.o

diff --git a/test/integration/comet2/svc2_out/0.txt b/test/integration/comet2/svc2_out/0.txt
index 4660237..33b36a3 100644 (file)
--- a/test/integration/comet2/svc2_out/0.txt
+++ b/test/integration/comet2/svc2_out/0.txt
@@ -1,2 +1,2 @@
-../../../../comet2 svc2_out.o
+../../../../comet2 a.o
 abcd

diff --git a/test/integration/comet2/svc2_out/svc2_out.o b/test/integration/comet2/svc2_out/a.o
similarity index 100%
rename from test/integration/comet2/svc2_out/svc2_out.o
rename to test/integration/comet2/svc2_out/a.o

diff --git a/test/integration/comet2/xor0/0.txt b/test/integration/comet2/xor0/0.txt
index aac5080..9faf9b8 100644 (file)
--- a/test/integration/comet2/xor0/0.txt
+++ b/test/integration/comet2/xor0/0.txt
@@ -1 +1 @@
-../../../../comet2 xor0.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/xor0/xor0.o b/test/integration/comet2/xor0/a.o
similarity index 100%
rename from test/integration/comet2/xor0/xor0.o
rename to test/integration/comet2/xor0/a.o

diff --git a/test/integration/comet2/xor1/0.txt b/test/integration/comet2/xor1/0.txt
index 1261130..9faf9b8 100644 (file)
--- a/test/integration/comet2/xor1/0.txt
+++ b/test/integration/comet2/xor1/0.txt
@@ -1 +1 @@
-../../../../comet2 xor1.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/xor1/xor1.o b/test/integration/comet2/xor1/a.o
similarity index 100%
rename from test/integration/comet2/xor1/xor1.o
rename to test/integration/comet2/xor1/a.o

diff --git a/test/integration/comet2/xor3/0.txt b/test/integration/comet2/xor3/0.txt
index 1cf903f..9faf9b8 100644 (file)
--- a/test/integration/comet2/xor3/0.txt
+++ b/test/integration/comet2/xor3/0.txt
@@ -1 +1 @@
-../../../../comet2 xor3.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/xor3/xor3.o b/test/integration/comet2/xor3/a.o
similarity index 100%
rename from test/integration/comet2/xor3/xor3.o
rename to test/integration/comet2/xor3/a.o

diff --git a/test/integration/comet2/xor4/0.txt b/test/integration/comet2/xor4/0.txt
index 2bcccf7..9faf9b8 100644 (file)
--- a/test/integration/comet2/xor4/0.txt
+++ b/test/integration/comet2/xor4/0.txt
@@ -1 +1 @@
-../../../../comet2 xor4.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/xor4/xor4.o b/test/integration/comet2/xor4/a.o
similarity index 100%
rename from test/integration/comet2/xor4/xor4.o
rename to test/integration/comet2/xor4/a.o

diff --git a/test/integration/comet2/xor5/0.txt b/test/integration/comet2/xor5/0.txt
index 06b213a..9faf9b8 100644 (file)
--- a/test/integration/comet2/xor5/0.txt
+++ b/test/integration/comet2/xor5/0.txt
@@ -1 +1 @@
-../../../../comet2 xor5.o
+../../../../comet2 a.o

diff --git a/test/integration/comet2/xor5/xor5.o b/test/integration/comet2/xor5/a.o
similarity index 100%
rename from test/integration/comet2/xor5/xor5.o
rename to test/integration/comet2/xor5/a.o

diff --git a/test/integration/dumpword/TEST.mk b/test/integration/dumpword/TEST.mk
index ff85704..ff4789b 100644 (file)
--- a/test/integration/dumpword/TEST.mk
+++ b/test/integration/dumpword/TEST.mk
@@ -21,7 +21,7 @@ cleanall: clean
 $(TESTSH): ../HEX.txt
        @xargs -n1 echo "$(DUMPWORD) $(DUMPWORDFLAG) " <$^ >$@
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
        @echo -n "$(UNITNAME): Test " >$@; \
      if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \

diff --git a/test/unit/TEST.mk b/test/unit/TEST.mk
index fee632d..b08dd02 100644 (file)
--- a/test/unit/TEST.mk
+++ b/test/unit/TEST.mk
@@ -40,7 +40,7 @@ $(SRCDIR)/%.o: $(SRCDIR)/%.c
 0.txt 1.txt: a.out
        @./a.out >$@ 2>&1
 diff.txt: 1.txt
-       @-diff 0.txt 1.txt >$@ 2>&1
+       @-diff -c 0.txt 1.txt >$@ 2>&1
 report.txt: diff.txt
        @echo -n "$(UNITNAME): Test " >$@; \
      if test ! -s $^; then echo -n "Success " >>$@; rm -f $^; else echo -n "Failure " >>$@; fi; \