Commit 9d16dd550ee51431d83e9fbfbc0adc022219b4c1

Authored by bellard
1 parent 78d6da97

make cpu test static


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@415 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 9 additions and 10 deletions
tests/Makefile
@@ -4,11 +4,12 @@ CFLAGS=-Wall -O2 -g @@ -4,11 +4,12 @@ CFLAGS=-Wall -O2 -g
4 LDFLAGS= 4 LDFLAGS=
5 5
6 ifeq ($(ARCH),i386) 6 ifeq ($(ARCH),i386)
7 -TESTS=testclone testsig testthread sha1-i386 test-i386 runcom 7 +TESTS=linux-test testthread sha1-i386 test-i386 runcom
8 endif 8 endif
9 -TESTS+=sha1 test_path 9 +TESTS+=sha1# test_path
  10 +#TESTS+=test_path
10 11
11 -QEMU=../i386/qemu 12 +QEMU=../i386/qemu-i386
12 13
13 all: $(TESTS) 14 all: $(TESTS)
14 15
@@ -16,12 +17,6 @@ hello-i386: hello-i386.c @@ -16,12 +17,6 @@ hello-i386: hello-i386.c
16 $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $< 17 $(CC) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
17 strip $@ 18 strip $@
18 19
19 -testclone: testclone.c  
20 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  
21 -  
22 -testsig: testsig.c  
23 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  
24 -  
25 testthread: testthread.c 20 testthread: testthread.c
26 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lpthread 21 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lpthread
27 22
@@ -32,7 +27,7 @@ test_path: test_path.c @@ -32,7 +27,7 @@ test_path: test_path.c
32 # i386 emulation test (test various opcodes) */ 27 # i386 emulation test (test various opcodes) */
33 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S \ 28 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S \
34 test-i386.h test-i386-shift.h test-i386-muldiv.h 29 test-i386.h test-i386-shift.h test-i386-muldiv.h
35 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ test-i386.c \ 30 + $(CC) $(CFLAGS) $(LDFLAGS) -static -o $@ test-i386.c \
36 test-i386-code16.S test-i386-vm86.S -lm 31 test-i386-code16.S test-i386-vm86.S -lm
37 32
38 ifeq ($(ARCH),i386) 33 ifeq ($(ARCH),i386)
@@ -44,6 +39,10 @@ endif @@ -44,6 +39,10 @@ endif
44 $(QEMU) test-i386 > test-i386.out 39 $(QEMU) test-i386 > test-i386.out
45 @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi 40 @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi
46 41
  42 +# generic Linux and CPU test
  43 +linux-test: linux-test.c
  44 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lm
  45 +
47 # speed test 46 # speed test
48 sha1-i386: sha1.c 47 sha1-i386: sha1.c
49 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< 48 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<