glibc2.2 fixes - more command line options - misc doc fixes

[mirror_qemu.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index c7d1154c00a6d2a3cb44ec565b13ba3081dd40c6..0d0fb9b956690487c61f62937d0f4df05d63a391 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,35 +4,49 @@ CFLAGS=-Wall -O2 -g
 LDFLAGS=
 
 ifeq ($(ARCH),i386)
-TESTS=hello test2 sha1 test-i386
+TESTS=testclone testsig testthread sha1-i386 test-i386
 endif
+TESTS+=sha1
 
-GEMU=../gemu
+QEMU=../qemu
 
 all: $(TESTS)
 
 hello: hello.c
        $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
+       strip hello
 
-test2: test2.c
+testclone: testclone.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
-# i386 emulation test (dump various opcodes) */
-test-i386: test-i386.c test-i386.h test-i386-shift.h test-i386-muldiv.h
-       $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ $< -lm
+testsig: testsig.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+testthread: testthread.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lpthread
+
+# i386 emulation test (test various opcodes) */
+test-i386: test-i386.c test-i386-code16.S \
+           test-i386.h test-i386-shift.h test-i386-muldiv.h
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test-i386.c test-i386-code16.S -lm
 
 test: test-i386
+ifeq ($(ARCH),i386)
        ./test-i386 > test-i386.ref
-       $(GEMU) test-i386 > test-i386.out
+endif
+       $(QEMU) test-i386 > test-i386.out
        @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi
 
 # speed test
-sha1: sha1.c
+sha1-i386: sha1.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
-speed: sha1
+sha1: sha1.c
+       $(HOST_CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+speed: sha1 sha1-i386
        time ./sha1
-       time $(GEMU) sha1
+       time $(QEMU) ./sha1-i386
 
 clean:
        rm -f *~ *.o $(TESTS)