ne2000 buffer fulness fix (Han Zhu)

[qemu] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 52e8129..59a0b6d 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,14 +1,18 @@
-include ../config.mak
+-include ../config-host.mak
 
-CFLAGS=-Wall -O2 -g
+CFLAGS=-Wall -O2 -g #-msse2
 LDFLAGS=
 
 ifeq ($(ARCH),i386)
-TESTS=testclone testsig testthread sha1-i386 test-i386 runcom
+TESTS=linux-test testthread sha1-i386 test-i386 runcom
 endif
-TESTS+=sha1 test_path
+ifeq ($(ARCH),x86_64)
+TESTS=test-x86_64
+endif
+TESTS+=sha1# test_path
+#TESTS+=test_path
 
-QEMU=../qemu
+QEMU=../i386-user/qemu-i386
 
 all: $(TESTS)
 
@@ -16,12 +20,6 @@ hello-i386: hello-i386.c
        $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
        strip $@
 
-testclone: testclone.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-
-testsig: testsig.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
-
 testthread: testthread.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lpthread
 
@@ -29,11 +27,15 @@ test_path: test_path.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
        ./$@ || { rm $@; exit 1; }
 
-# i386 emulation test (test various opcodes) */
+# i386/x86_64 emulation test (test various opcodes) */
 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S \
            test-i386.h test-i386-shift.h test-i386-muldiv.h
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test-i386.c \
-              test-i386-code16.S test-i386-vm86.S -lm
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ \
+              test-i386.c test-i386-code16.S test-i386-vm86.S -lm
+
+test-x86_64: test-i386.c \
+           test-i386.h test-i386-shift.h test-i386-muldiv.h
+       $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ test-i386.c -lm
 
 ifeq ($(ARCH),i386)
 test: test-i386
@@ -43,6 +45,14 @@ test:
 endif
        $(QEMU) test-i386 > test-i386.out
        @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi
+ifeq ($(ARCH),i386)
+       $(QEMU) -no-code-copy test-i386 > test-i386.out
+       @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK (no code copy)"; fi
+endif
+
+# generic Linux and CPU test
+linux-test: linux-test.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lm
 
 # speed test
 sha1-i386: sha1.c
@@ -59,6 +69,11 @@ speed: sha1 sha1-i386
 runcom: runcom.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
+# NOTE: -fomit-frame-pointer is currently needed : this is a bug in libqemu
+qruncom: qruncom.c ../i386-user/libqemu.a
+       $(CC) $(CFLAGS) -fomit-frame-pointer $(LDFLAGS) -I../target-i386 -I.. -I../i386-user -I../fpu \
+              -o $@ $< -L../i386-user -lqemu -lm
+
 # arm test
 hello-arm: hello-arm.o
        arm-linux-ld -o $@ $<
@@ -66,5 +81,12 @@ hello-arm: hello-arm.o
 hello-arm.o: hello-arm.c
        arm-linux-gcc -Wall -g -O2 -c -o $@ $<
 
+# XXX: find a way to compile easily a test for each arch
+test2:
+       @for arch in i386 arm armeb sparc ppc mips mipsel; do \
+           ../$${arch}-user/qemu-$${arch} $${arch}/ls -l linux-test.c ; \
+        done
+
 clean:
-       rm -f *~ *.o $(TESTS)
+       rm -f *~ *.o test-i386.out test-i386.ref \
+           test-x86_64.log test-x86_64.ref qruncom $(TESTS)