diff --git a/Makefile b/Makefile index 730b817..bbe8415 100644 --- a/Makefile +++ b/Makefile @@ -262,15 +262,19 @@ tar: rm -rf /tmp/$(TCC-VERSION) # in tests subdir -test clean : +test clean: $(MAKE) -C tests $@ +config.mak: + @echo Running configure ... + @./configure + # clean clean: local_clean local_clean: rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod *~ *.o *.a *.out libtcc_test$(EXESUF) distclean: clean - rm -vf config.h config.mak config.texi tcc.1 tcc-doc.html + rm -vf config.h config.mak config.texi tcc.1 endif # ifeq ($(TOP),.) diff --git a/tests/Makefile b/tests/Makefile index 98e1b3e..f91e4fd 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -6,7 +6,7 @@ TESTS = libtest test3 # these should work too -# TESTS += test1 test2 speed btest +# TESTS += test1 test2 speedtest btest # these don't work as they should # TESTS += test4 asmtest @@ -23,6 +23,7 @@ all test : $(TESTS) # make sure that tcc exists $(TESTS) : ../tcc + ../tcc ../libtcc.a : $(MAKE) -C .. @@ -104,7 +105,7 @@ btest: boundtest.c echo; echo Bound test OK # speed test -speed: ex2 ex3 +speedtest: ex2 ex3 @echo ------------ $@ ------------ time ./ex2 1238 2 3 4 10 13 4 time $(TCC) -run ../examples/ex2.c 1238 2 3 4 10 13 4 @@ -116,13 +117,13 @@ ex%: ../examples/ex%.c # tiny assembler testing asmtest.ref: asmtest.S - $(CC) -o asmtest.ref.o -c asmtest.S - objdump -D asmtest.ref.o > $@ + $(CC) -Wa,-W -o asmtest.ref.o -c asmtest.S + objdump -D asmtest.ref.o > asmtest.ref asmtest: asmtest.ref @echo ------------ $@ ------------ $(TCC) -c asmtest.S - objdump -D asmtest.o > $@ + objdump -D asmtest.o > asmtest.out @if diff -u --ignore-matching-lines="file format" asmtest.ref asmtest.out ; then echo "ASM Auto Test OK"; fi # targets for development diff --git a/tests/asmtest.S b/tests/asmtest.S index 358a823..3e34455 100644 --- a/tests/asmtest.S +++ b/tests/asmtest.S @@ -341,9 +341,9 @@ L3: fnstcw 0x1002 fstcw 0x1002 fnstsw 0x1004 - fnstsw %eax + fnstsw (%eax) fstsw 0x1004 - fstsw %eax + fstsw (%eax) fnclex fclex fnstenv 0x1000