From a803ee062b8bb9d39cad9d0a7f310def26a45f76 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 23 Feb 2017 08:22:31 +0100 Subject: [PATCH] Tests: Avoid race condition when building with multiple jobs Change-Id: Ia5a110812694d03e6f6e02cf66b4aaf209224910 Reviewed-by: hjk Reviewed-by: Eike Ziller --- tests/auto/debugger/debugger.pro | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro index 3535e9c53af..12a115c9195 100644 --- a/tests/auto/debugger/debugger.pro +++ b/tests/auto/debugger/debugger.pro @@ -1,16 +1,15 @@ TEMPLATE = subdirs -gdb.file = gdb.pro -simplifytypes.file = simplifytypes.pro +# Avoid race condition when compiling with multiple jobs or moc_predefs.h might get used and +# overridden at the same time as the sub projects are using the same build directory. +# Correct would be to completely rearrange these sub projects into sub directories, using the +# quick fix instead. +CONFIG += ordered -# avoid race condition when compiling with multiple jobs -dumpers.depends = gdb simplifytypes -dumpers.file = dumpers.pro - -SUBDIRS += gdb -SUBDIRS += simplifytypes -SUBDIRS += dumpers +SUBDIRS += gdb.pro +SUBDIRS += simplifytypes.pro +SUBDIRS += dumpers.pro SUBDIRS += namedemangler.pro SUBDIRS += disassembler.pro SUBDIRS += offsets.pro