テストの方法を修正

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

diff --git a/test/TEST.mk b/test/TEST.mk
index baa0d25da537c39b19d611c9b3c460d2988646d8..f6141e2f14b5508dd0151a745cf3ea3a0c11fbbd 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 1f1dad3e57fd6b204d6667987bb6b68d52f36c5d..bb834574232e6999ff28c9233a0c2fb71295ccc5 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 336e8feeddc312246331efc98e929134b261c84f..904b8106017320b6a75c5059070a7f6f167b4e66 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 b1dd3b061f9d0b61ba82ff8d9f159a5a0488d350..3e9bfabe4f5ca1695cf64f36da6a268075e5ff4f 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 d2174d7ba48a447a287ba3dbce28f0e5aa64cc38..3ec7fed70e1f42c80c0300d56a63cd5f3df74fc3 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 a8219d69a60f381e9d3f987f7802f47e8b101ff0..c5ec3263463260435f7dff4356afdfd3db8f6fb0 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 8420ae7bdd7f84683fa6145eb43af9f5568d23c7..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 3cd03d5d6cc5f4909e138f42a12b41a8662e5c03..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 f656d4d51a72e4dafc9087c0db49f3d877ff16c4..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 da4c46e8639d5699fc2dd21bf494246e9d6f9bb9..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 d1f517133021ee3b1ed3dab1a9645cae5990d643..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 b19679facdc27f0f41f1648e5a124ac8df3baedb..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 4c72b26ea59cceb8c37c0d3f8bf2a37ed95b1c78..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 0ea103003fa9fe75345b50ef76ff6ddd05fe0537..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 efa4d336a443b0ed28ae9a6f648c6b5b71bae66a..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 6a54f7f456692fd6b86c46ce1369c2bcb2527f1b..df48c3db24e0d85b8af409149f093f3dccede7a9 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 63ea10bc06d2347009bf066450f9db76b6a7c120..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 fd8283fd86ae136cca6f825fe84bce5050a9cb4d..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 a0cc8ef85beacbc95c324dda7d4cad375d68ba70..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 e638c3e22615ab862e1dbc1b0c5df0619eac9cf9..f1a15f01e5e24a42eb0fb9fd99c007f3e2327c2d 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 d1fe1c1e3dc9b8a9d01d6cf7381e03152ecd293c..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 80c1f2d77fd0f770e77c6d7e0ae831a4c11ddb6c..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 67e29a5fbcd0f99290a5a163edeead0346fa3823..c29b2179a7354eddc7088eadf7f63f2e4ea19379 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 f1c1376fc03f286429e5f2181e5505d50d021644..64cfd06eedbda826fbeac68f8f4701333bfa1b8e 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 bfdfe4f32071af6aa719ffe33be80c4f65cd5b9a..64cfd06eedbda826fbeac68f8f4701333bfa1b8e 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 b22242ef7b306c4aea8f3effd03018e152c1bfb2..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 58f7bcee4cbf4683f85af52d683d17ad1b147739..4d4d972cb069feaa1d1565ebd8ec4191fbfc4b7f 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 622e7ce90aeb63e6b645b77454f5aaed8d9076b2..9b53a916870c9fec4ece4db624d2989dfc897f2b 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 1f81a04fe3b743478274821dd087de6c84812481..420d1d3787a2037862c018b8f4250bed6d322aff 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 561c5208290e4c3755a378ddafd0ddd7a9451b0f..638b1719063d2e256364b2f5a826c3140cd2c86b 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 b382fd697ea65f4915a3880107bd6d844251c23d..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 26de6e4b52717ea6188eb60b391c8b36c55d6906..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 72a596b9ae1d353771b911b8f57f9053da65c3d8..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 14683036a82a468f1b32bf5a02a3b913f20cbfd3..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 a20e9d4e8133f24f8f0ced9a63e8f9ff7ff4461f..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 d2e665902d193f5bee1fabe3b27b8261c36ef6e3..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 5f59e833e50193ee8a7dfb242e038e8199b0aa7e..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 1a2fd81844b72dbc7c11d792e2e6a70ee8c61075..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 bf15a018ad0d86424be0e4def320bad501ebf945..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 ccc345fa61a25c7249c129270c3c52e767c83adb..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 02b0a1cc5a77ad645052187e1cbd79b328a1055b..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 bb21b9f6e0671162d7139b29769f4635c372fe59..c29b2179a7354eddc7088eadf7f63f2e4ea19379 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 adb8830a5d54461b9638de706194aa54fde2cbb7..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 dd71b809458333f8dc858ca3f906bbaab2dd3aa3..4f01b01c38e276bdc0010a5bfc5422f5fde74062 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 1d9e83bd679642c6b86af1c4402d161c33cc9c0c..3b447a6d2ff8dd291dfd3ae8cc7d2afc84320b3f 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 7b2dc2b0e329381646f4327d15ae3dfcf37d648a..edf1ed25f2eee2e673e2accd35636828f49076d2 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 4cf89f55509b1259a135792e16ff7fbdcf0be491..edf1ed25f2eee2e673e2accd35636828f49076d2 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 76c7837fc81bccda35fca7a06b508742f2c69f27..c1e27a90074e299e4b40dd699a94b87ef73c31af 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 61557e2c37f04f5699825f841d7a3d3f97d7ce3f..d261ab8ef563208467328fc7c279c27d77f7f2eb 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 b1dbe573ffc2e5213fc7dc95b3df3d0cbc250860..aa56b627508aa63faaebdf4baded032ede72c5c2 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 59fcefbaab9ec5b12fa47ad50eea24146ff704eb..ee5fdd233651c7670b5a61d14977cf3bf6919648 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 081fcc729da9165b06668dc91ffedf4377922970..0ab2a2508e6d843a703e0a083d121bc471a4ea96 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 1c9d646bac926ed6e08a8b04c491043cddbcf0eb..d94db6d77721717d6dc26f24131c0f8d9b9900b0 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 1e668e0e3bd1122aa98830bcefc511961ed38880..b31e992a83a854b9395aba84e081302efd3c72f2 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 01dbde4ca5e4c119616643e2bf3315f674c9fdde..ff921e9e74bcd9be0f83d142c1d984f8afc60848 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 eec80acc6bba4c8c7062289817e2c62400185a3e..06b8df79126706a156097a36793a68834f93aa49 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 58b4af4d2d8fe5a17160f32fac005f1a4f98ccf1..74db298ea3608b9739cc35bfcaf06241f29b3d1a 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 721c6502943f35e5f0927f95c61e952ddb50c433..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 a1a31cfe49a4991d97ccebbedc23a2059898135a..e3ff4d1246742de93bb5daebf9a00b66362a29f6 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 b276a2e5bfd13af99725b63467e3c2ccc78a0667..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 01fe12f21e5636c4d7647aa263a902a73f84ad4b..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 2de3d0a2bc92a1a195872fcb8c9bfc66be340527..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 90a81ec310ddd37b329045b716317cf1152230bf..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 ea37d6b8937c6d288148c7108072a461d432f519..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 2a85e99f03062d7409a0733587918c24383e7014..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 fdd6688afad09df5e8e7e2c6fc774203c94c31ce..40b54c04cd50c1cc28ea09bfb0279dbd09cfee75 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 257d4422a4e164288c152fb44d3fc14bd3855790..45a29f08466cfbe43a591accca15d60930755c79 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 f82f4b59c4ab74c7919b073580bb767736fa9dc6..09653f34d9e3b5a817a2fa005600425acb7bed14 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 b55fd713b4c0e8c716edb1b29b1f5a46819f8833..92724ec8ef1476b4a91d02fc09d82426be97bae9 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 88c4db620d9543608608e998bad30a16f9147d60..c31c933a57e48f4cd6b56260a5dfea0b953b16d6 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 b00220f422cf96c24bea61d34c6cb52676c0a655..f0762a09d48cd3cc58ca57528daedc3029fce5c3 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 6111897f7658b2d796de18764b4f3078400611b2..bc62173eeca515b0ea23aa5bee0bcc2b30a78fb6 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 440a664f660eeaddbb2010caa7db33d1f8373107..c1e27a90074e299e4b40dd699a94b87ef73c31af 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 46602371cff30460497f5e2dcbe30a8a3df54309..33b36a3f725825c08ed5da9a2e920ab3f7ff1e11 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 aac5080508b298e2376676b77511e887e715b5c6..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 12611303e26aa236f05f56348817b1aaaf7daa06..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 1cf903f074149a6bee4b25ec4c3a7c62de641321..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 2bcccf7dadebc268e98a51e5c54a821bb3deed56..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 06b213a4be093b8f2aaae6eacb73d1e84da08a79..9faf9b8ca7c03f019001c990e2994f3b06ac21e0 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 ff85704e4cf0d152f8531d9beac4af411401fa4b..ff4789b6be54674abe02b299c95e7fa8ab00dc8c 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 fee632ddaecaa45c4bb843a3ea73d2aef2aff865..b08dd027ee4a9c7f5913e22c1a608d3630d62978 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; \