build all targets at the same time

[mirror_qemu.git] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 14521fad6e2494e18305261e82eb8839fa7bc377..f4e1b22f44743aaa20101cfaf77e8c4d9c5512a7 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,4 +1,4 @@
-include ../config.mak
+include ../config-host.mak
 
 CFLAGS=-Wall -O2 -g
 LDFLAGS=
@@ -6,15 +6,15 @@ LDFLAGS=
 ifeq ($(ARCH),i386)
 TESTS=testclone testsig testthread sha1-i386 test-i386 runcom
 endif
-TESTS+=sha1
+TESTS+=sha1 test_path
 
-QEMU=../qemu
+QEMU=../i386/qemu
 
 all: $(TESTS)
 
-hello: hello.c
+hello-i386: hello-i386.c
        $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
-       strip hello
+       strip $@
 
 testclone: testclone.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
@@ -25,14 +25,21 @@ testsig: testsig.c
 testthread: testthread.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lpthread
 
+test_path: test_path.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+       ./$@ || { rm $@; exit 1; }
+
 # i386 emulation test (test various opcodes) */
-test-i386: test-i386.c test-i386-code16.S \
+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 -lm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test-i386.c \
+              test-i386-code16.S test-i386-vm86.S -lm
 
-test: test-i386
 ifeq ($(ARCH),i386)
+test: test-i386
        ./test-i386 > test-i386.ref
+else
+test:
 endif
        $(QEMU) test-i386 > test-i386.out
        @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi
@@ -52,5 +59,12 @@ speed: sha1 sha1-i386
 runcom: runcom.c
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
+# arm test
+hello-arm: hello-arm.o
+       arm-linux-ld -o $@ $<
+
+hello-arm.o: hello-arm.c
+       arm-linux-gcc -Wall -g -O2 -c -o $@ $<
+
 clean:
        rm -f *~ *.o $(TESTS)