mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/tcg: fix build

Browse Source 
This broke when the tests were moved from tests/ to tests/tcg/.

On x86_64 host/i386-linux-user non-kvm guest, test-i386 and test-mmap are broken, but at least they build.

To build/run the tests:
$ cd $BUILD_PATH/tests/tcg
$ SRC_PATH=path/to/qemu make <target>

Signed-off-by: Catalin Patulea <catalinp@google.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Catalin Patulea 2012-10-16 16:00:23 -04:00 committed by Aurelien Jarno
parent 7748b8cb1d
commit f62cb1b6dd
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/tcg/Makefile
View File

@ -1,13 +1,13 @@
-include ../config-host.mak
-include ../../config-host.mak
-include $(SRC_PATH)/rules.mak
$(call set-vpath, $(SRC_PATH)/tests)
$(call set-vpath, $(SRC_PATH)/tests/tcg)
QEMU=../i386-linux-user/qemu-i386
QEMU_X86_64=../x86_64-linux-user/qemu-x86_64
QEMU=../../i386-linux-user/qemu-i386
QEMU_X86_64=../../x86_64-linux-user/qemu-x86_64
CC_X86_64=$(CC_I386) -m64
QEMU_INCLUDES += -I..
QEMU_INCLUDES += -I../..
CFLAGS=-Wall -O2 -g -fno-strict-aliasing
#CFLAGS+=-msse2
LDFLAGS=
@ -36,6 +36,7 @@ TESTS += $(I386_TESTS)
endif
all: $(patsubst %,run-%,$(TESTS))
test: all
# rules to run tests
@ -74,7 +75,10 @@ run-test_path: test_path
# rules to compile tests
test_path: test_path.o
$(CC_I386) $(LDFLAGS) -o $@ $^ $(LIBS)
test_path.o: test_path.c
$(CC_I386) $(QEMU_INCLUDES) $(GLIB_CFLAGS) $(CFLAGS) -c -o $@ $^
hello-i386: hello-i386.c
$(CC_I386) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $<
@ -86,12 +90,12 @@ testthread: testthread.c
# 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_I386) $(CFLAGS) $(LDFLAGS) -o $@ \
$(CC_I386) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ \
$(<D)/test-i386.c $(<D)/test-i386-code16.S $(<D)/test-i386-vm86.S -lm
test-x86_64: test-i386.c \
test-i386.h test-i386-shift.h test-i386-muldiv.h
$(CC_X86_64) $(CFLAGS) $(LDFLAGS) -o $@ $(<D)/test-i386.c -lm
$(CC_X86_64) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ $(<D)/test-i386.c -lm
# generic Linux and CPU test
linux-test: linux-test.c

2
tests/tcg/linux-test.c
View File

@ -16,6 +16,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _GNU_SOURCE
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
@ -38,6 +39,7 @@
#include <dirent.h>
#include <setjmp.h>
#include <sys/shm.h>
#include <sched.h>
#define TESTPATH "/tmp/linux-test.tmp"
#define TESTPORT 7654

3
tests/tcg/test-i386.c
View File

@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _GNU_SOURCE
#include "compiler.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@ -1827,7 +1828,7 @@ void test_exceptions(void)
printf("lock nop exception:\n");
if (setjmp(jmp_env) == 0) {
/* now execute an invalid instruction */
asm volatile("lock nop");
asm volatile(".byte 0xf0, 0x90"); /* lock nop */
}
printf("INT exception:\n");

13
tests/tcg/test_path.c
View File

@ -1,11 +1,12 @@
/* Test path override code */
#include "../config-host.h"
#include "../qemu-malloc.c"
#include "../cutils.c"
#include "../path.c"
#include "../trace.c"
#define _GNU_SOURCE
#include "config-host.h"
#include "iov.c"
#include "cutils.c"
#include "path.c"
#include "trace.c"
#ifdef CONFIG_TRACE_SIMPLE
#include "../simpletrace.c"
#include "../trace/simple.c"
#endif
#include <stdarg.h>