From: Christoph Egger <christoph@christoph-egger.org>
Date: Tue, 2 Jun 2015 21:59:42 +0000 (+0200)
Subject: Temp-fix tests
X-Git-Url: https://git.siccegge.de//index.cgi?a=commitdiff_plain;h=66b8dcbe36a247620e2eebb1bcb29c3fc4c3bd51;p=frida%2Ffrida.git

Temp-fix tests

We should probably wait for the disassembler to work through the
binary before trying to retrieve the functions. Then however we can't
really decide whether the disassembler failed to find the function or
is just slow.
---

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index f59afa0..604425e 100644
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -45,10 +45,14 @@ void InformationManager::reset(const std::string& filename) {
 	disassembler.reset(createLLVMDisassembler(filename, this));
 	if (disassembler.get() != NULL) {
 		emit resetEvent();
+#ifndef CONFIG_TEST
 		disassembler.get()->moveToThread(&disassemblerThread);
 		connect(&disassemblerThread, &QThread::started,
 		        disassembler.get(), &Disassembler::start);
 		disassemblerThread.start();
+#else
+		disassembler.get()->start();
+#endif
 	}
 }