]> git.siccegge.de Git - frida/frida.git/commitdiff
Temp-fix tests
authorChristoph Egger <christoph@christoph-egger.org>
Tue, 2 Jun 2015 21:59:42 +0000 (23:59 +0200)
committerChristoph Egger <christoph@christoph-egger.org>
Tue, 2 Jun 2015 21:59:42 +0000 (23:59 +0200)
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.

src/core/InformationManager.cxx

index f59afa04aaf9c2e8f5f203fd8097c2ceed686b0a..604425e617499fa5155e3db8d84f40af49448824 100644 (file)
@@ -45,10 +45,14 @@ void InformationManager::reset(const std::string& filename) {
        disassembler.reset(createLLVMDisassembler(filename, this));
        if (disassembler.get() != NULL) {
                emit resetEvent();
        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();
                disassembler.get()->moveToThread(&disassemblerThread);
                connect(&disassemblerThread, &QThread::started,
                        disassembler.get(), &Disassembler::start);
                disassemblerThread.start();
+#else
+               disassembler.get()->start();
+#endif
        }
 }
 
        }
 }