We actually don't need threading right here

Author: adriweb

gui/qt/CEmu.pro

@@ -5,7 +5,7 @@ if (0) { # GitHub release/deployment build. Has to correspond to the git tag.
     DEFINES += CEMU_VERSION=\\\"1.0\\\"
 } else { # Development build. Used in the about screen
     GIT_VERSION = $$system(git describe --abbrev=7 --dirty --always --tags)
-    DEFINES += CEMU_VERSION=\\\"0.4dev_$$GIT_VERSION\\\"
+    DEFINES += CEMU_VERSION=\\\"0.5dev_$$GIT_VERSION\\\"
 }
 
 # Code beautifying
@@ -85,7 +85,6 @@ SOURCES +=  utils.cpp \
     tivarslib/utils_tivarslib.cpp \
     tivarslib/TypeHandlers/TH_0x00.cpp \
     tivarslib/TypeHandlers/TH_0x05.cpp \
-    autotesterthread.cpp \
     ../../tests/autotester/autotester.cpp \
     ../../core/asic.c \
     ../../core/cpu.c \
@@ -142,7 +141,6 @@ HEADERS  +=  utils.h \
     tivarslib/TypeHandlers/TH_0x04.h \
     tivarslib/TypeHandlers/TH_0x05.h \
     tivarslib/TypeHandlers/TH_0x06.h \
-    autotesterthread.h \
     ../../tests/autotester/autotester.h \
     ../../core/asic.h \
     ../../core/cpu.h \

gui/qt/autotesterthread.cpp

@@ -48,7 +48,6 @@
 #include "../../core/os/os.h"
 
 #include "../../tests/autotester/autotester.h"
-#include "autotesterthread.h"
 
 
 static const constexpr int WindowStateVersion = 0;
@@ -130,7 +129,6 @@ MainWindow::MainWindow(QWidget *p) : QMainWindow(p), ui(new Ui::MainWindow) {
     connect(ui->buttonReceiveFiles, &QPushButton::clicked, this, &MainWindow::saveSelected);
 
     // Autotester
-    connect(&tester, &AutotesterThread::testError, this, &MainWindow::dispAutotesterError, Qt::QueuedConnection);
     connect(ui->buttonOpenJSONconfig, &QPushButton::clicked, this, &MainWindow::prepareAndOpenJSONConfig);
     connect(ui->buttonReloadJSONconfig, &QPushButton::clicked, this, &MainWindow::reloadJSONConfig);
     connect(ui->buttonLaunchTest, &QPushButton::clicked, this, &MainWindow::launchTest);
@@ -1169,7 +1167,11 @@ void MainWindow::launchTest() {
     sendFiles(filesList);
     QThread::msleep(200);
 
-    autotester_thread->launchActualTest();
+    // Follow the sequence
+    if (!autotester::doTestSequence()) {
+        dispAutotesterError(1);
+        return;
+    }
 }
 
 /* ================================================ */

gui/qt/autotesterthread.h

@@ -12,7 +12,6 @@
 #include "lcdwidget.h"
 #include "romselection.h"
 #include "emuthread.h"
-#include "autotesterthread.h"
 #include "../../core/vat.h"
 #include "../../core/debug/debug.h"
 #include "../../core/debug/disasm.h"
@@ -227,7 +226,6 @@ public slots:
     QDir currentDir;
     QString currentEquateFile;
     EmuThread emu;
-    AutotesterThread tester;
 
     bool debuggerOn = false;
     bool inReceivingMode = false;