From ee321b3fb13d2576c1048248a0b654d1d9fefc9a Mon Sep 17 00:00:00 2001 From: eelke Date: Sun, 7 Jan 2018 09:18:51 +0100 Subject: [PATCH] Bunch of tests were in header files so they all got compiled when main got compiled. Prefer to have them in seperate compilation units for faster make times when changing tests. Also parallel build is faster with seperate cpps. --- tests/pglabtests/main.cpp | 8 +------- tests/pglabtests/pglabtests.pro | 12 ++++++------ .../{tst_CsvWriter.h => tst_CsvWriter.cpp} | 0 ...tst_PasswordManager.h => tst_PasswordManager.cpp} | 0 .../pglabtests/{tst_SqlLexer.h => tst_SqlLexer.cpp} | 0 .../pglabtests/{tst_expected.h => tst_expected.cpp} | 0 .../{tst_scopeguard.h => tst_scopeguard.cpp} | 0 7 files changed, 7 insertions(+), 13 deletions(-) rename tests/pglabtests/{tst_CsvWriter.h => tst_CsvWriter.cpp} (100%) rename tests/pglabtests/{tst_PasswordManager.h => tst_PasswordManager.cpp} (100%) rename tests/pglabtests/{tst_SqlLexer.h => tst_SqlLexer.cpp} (100%) rename tests/pglabtests/{tst_expected.h => tst_expected.cpp} (100%) rename tests/pglabtests/{tst_scopeguard.h => tst_scopeguard.cpp} (100%) diff --git a/tests/pglabtests/main.cpp b/tests/pglabtests/main.cpp index 046652f..291bdee 100644 --- a/tests/pglabtests/main.cpp +++ b/tests/pglabtests/main.cpp @@ -1,10 +1,4 @@ -#include "tst_CsvWriter.h" -#include "tst_expected.h" -#include "tst_PasswordManager.h" -#include "tst_scopeguard.h" -#include "tst_SqlLexer.h" - -#include +#include int main(int argc, char *argv[]) { diff --git a/tests/pglabtests/pglabtests.pro b/tests/pglabtests/pglabtests.pro index 677d4ff..0899186 100644 --- a/tests/pglabtests/pglabtests.pro +++ b/tests/pglabtests/pglabtests.pro @@ -8,15 +8,15 @@ CONFIG += qt QT += core -HEADERS += \ - tst_expected.h \ - tst_SqlLexer.h \ - tst_scopeguard.h \ - tst_CsvWriter.h \ - tst_PasswordManager.h +HEADERS += SOURCES += main.cpp \ tst_ExplainJsonParser.cpp \ + tst_expected.cpp \ + tst_SqlLexer.cpp \ + tst_scopeguard.cpp \ + tst_CsvWriter.cpp \ + tst_PasswordManager.cpp \ tst_ParamJson.cpp win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../core/release/ -lcore diff --git a/tests/pglabtests/tst_CsvWriter.h b/tests/pglabtests/tst_CsvWriter.cpp similarity index 100% rename from tests/pglabtests/tst_CsvWriter.h rename to tests/pglabtests/tst_CsvWriter.cpp diff --git a/tests/pglabtests/tst_PasswordManager.h b/tests/pglabtests/tst_PasswordManager.cpp similarity index 100% rename from tests/pglabtests/tst_PasswordManager.h rename to tests/pglabtests/tst_PasswordManager.cpp diff --git a/tests/pglabtests/tst_SqlLexer.h b/tests/pglabtests/tst_SqlLexer.cpp similarity index 100% rename from tests/pglabtests/tst_SqlLexer.h rename to tests/pglabtests/tst_SqlLexer.cpp diff --git a/tests/pglabtests/tst_expected.h b/tests/pglabtests/tst_expected.cpp similarity index 100% rename from tests/pglabtests/tst_expected.h rename to tests/pglabtests/tst_expected.cpp diff --git a/tests/pglabtests/tst_scopeguard.h b/tests/pglabtests/tst_scopeguard.cpp similarity index 100% rename from tests/pglabtests/tst_scopeguard.h rename to tests/pglabtests/tst_scopeguard.cpp