| Message ID | 1398769764-25493-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
29.04.2014 15:09, Peter Maydell wrote: > The test_path binary is (unlike the other test binaries in tests/tcg) > actually intended to be compiled with the same compiler used to build > the main QEMU executables. It actually #includes a number of the > QEMU source files in an attempt to unit-test the util/path.c functions, > and so if it is not compiled with the same compiler used by configure > to set CONFIG_ settings then it is liable to fail to build. > Fix the makefile to build it with the default C compiler rules, not > CC_I386, and fix the test itself not to include a lot of unnecessary > trace related source files which cause the build to fail if the trace > backend is anything other than 'simple'. Yay, ACK! Applies to -trivial, thank you! /mjt
diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 24e3154..89e3342 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -81,10 +81,8 @@ 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 $@ $< diff --git a/tests/tcg/test_path.c b/tests/tcg/test_path.c index f8dd36a..1c29bce 100644 --- a/tests/tcg/test_path.c +++ b/tests/tcg/test_path.c @@ -1,17 +1,10 @@ /* Test path override code */ -#define _GNU_SOURCE #include "config-host.h" #include "util/cutils.c" #include "util/hexdump.c" #include "util/iov.c" #include "util/path.c" #include "util/qemu-timer-common.c" -#include "trace/control.c" -#include "../trace/generated-events.c" -#ifdef CONFIG_TRACE_SIMPLE -#include "trace/simple.c" -#endif - #include <stdarg.h> #include <sys/stat.h> #include <fcntl.h>
The test_path binary is (unlike the other test binaries in tests/tcg) actually intended to be compiled with the same compiler used to build the main QEMU executables. It actually #includes a number of the QEMU source files in an attempt to unit-test the util/path.c functions, and so if it is not compiled with the same compiler used by configure to set CONFIG_ settings then it is liable to fail to build. Fix the makefile to build it with the default C compiler rules, not CC_I386, and fix the test itself not to include a lot of unnecessary trace related source files which cause the build to fail if the trace backend is anything other than 'simple'. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Changes v1->v2: * drop the CC lines entirely, and drop define of _GNU_SOURCE since we can get that from our cflags via the default .c->.o rule tests/tcg/Makefile | 2 -- tests/tcg/test_path.c | 7 ------- 2 files changed, 9 deletions(-)