fixed invalid includes

[qemu] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 6daaaa2..1142dea 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -9,7 +9,7 @@ endif
 TESTS+=sha1# test_path
 #TESTS+=test_path
 
-QEMU=../i386/qemu-i386
+QEMU=../i386-user/qemu-i386
 
 all: $(TESTS)
 
@@ -38,6 +38,10 @@ 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
@@ -58,6 +62,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 \
+              -o $@ $< -L../i386-user -lqemu -lm
+
 # arm test
 hello-arm: hello-arm.o
        arm-linux-ld -o $@ $<
@@ -65,5 +74,11 @@ 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 sparc ppc; 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 qruncom $(TESTS)