[Qemu-devel] [PATCH] tests: Fix 'make test' for i686 hosts (build regression)

[Stefan Weil <sw@weilnetz.de>]

'make test' is broken at least since commit
baacf04799ace72a9c735dd9306a1ceaf305e7cf. Several source files were moved
to util/, and some of them there split, so add the missing prefix and new
files to fix the compiler and linker errors.

There remain more issues, but these changes allow running the test on a
Linux i686 host.

Cc: qemu-stable@nongnu.org
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

'make test' shows several problems where the results from native
execution and user mode emulation differ. Obviously the TCG code
or at least one helper function don't work as expected.

The patch might be useful for QEMU stable, too. I did not use it
with older versions, so I still don't know whether there was a TCG
regression and when it occurred.

Running 'make test' on an x86_64 host is currently not possible.
There is at least one -m32 compiler option missing, and a 32 bit
version of glib2.0 must be installed (not available for Debian
wheezy, so I had to stop here).

Regards
Stefan

 tests/tcg/test_path.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/tcg/test_path.c b/tests/tcg/test_path.c
index a064eea..f8dd36a 100644
--- a/tests/tcg/test_path.c
+++ b/tests/tcg/test_path.c
@@ -1,12 +1,15 @@
 /* Test path override code */
 #define _GNU_SOURCE
 #include "config-host.h"
-#include "iov.c"
-#include "cutils.c"
-#include "path.c"
-#include "trace.c"
+#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"
+#include "trace/simple.c"
 #endif
 
 #include <stdarg.h>
-- 
1.7.9.5