diff --git a/pglabAll.pro b/pglabAll.pro index 7ccf6de..ae61f1d 100644 --- a/pglabAll.pro +++ b/pglabAll.pro @@ -15,6 +15,7 @@ pglablib.depends = core pgsql tests.depends = core pgsql pglablib + CONFIG(debug, debug|release) { SUBDIRS += tests } diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro deleted file mode 100644 index 576a9ff..0000000 --- a/tests/auto/auto.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += mycase diff --git a/tests/auto/gtest_dependency.pri b/tests/pglabtests/gtest_dependency.pri similarity index 100% rename from tests/auto/gtest_dependency.pri rename to tests/pglabtests/gtest_dependency.pri diff --git a/tests/auto/mycase/main.cpp b/tests/pglabtests/main.cpp similarity index 100% rename from tests/auto/mycase/main.cpp rename to tests/pglabtests/main.cpp diff --git a/tests/auto/mycase/mycase.pro b/tests/pglabtests/pglabtests.pro similarity index 55% rename from tests/auto/mycase/mycase.pro rename to tests/pglabtests/pglabtests.pro index 9a1cd56..677d4ff 100644 --- a/tests/auto/mycase/mycase.pro +++ b/tests/pglabtests/pglabtests.pro @@ -1,7 +1,7 @@ -include(../gtest_dependency.pri) +include(gtest_dependency.pri) TEMPLATE = app -CONFIG += console c++11 +CONFIG += console c++14 CONFIG -= app_bundle CONFIG += thread CONFIG += qt @@ -19,44 +19,44 @@ SOURCES += main.cpp \ tst_ExplainJsonParser.cpp \ tst_ParamJson.cpp -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../core/debug/ -lcore +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../core/release/ -lcore +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../core/debug/ -lcore INCLUDEPATH += C:\prog\include \ C:\Prog\include\pgsql \ C:\VSproj\boost32\include\boost-1_65_1 -INCLUDEPATH += $$PWD/../../../core -DEPENDPATH += $$PWD/../../../core +INCLUDEPATH += $$PWD/../../core +DEPENDPATH += $$PWD/../../core LIBS += c:\prog\lib\botand_imp.lib -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../core/release/libcore.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../core/debug/libcore.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../core/debug/core.lib +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/libcore.a +else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/libcore.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/release/core.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../core/debug/core.lib -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../pgsql/release/ -lpgsql -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../pgsql/debug/ -lpgsql -else:unix:!macx: LIBS += -L$$OUT_PWD/../../../pgsql/ -lpgsql +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/release/ -lpgsql +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/debug/ -lpgsql +else:unix:!macx: LIBS += -L$$OUT_PWD/../../pgsql/ -lpgsql -INCLUDEPATH += $$PWD/../../../pgsql -DEPENDPATH += $$PWD/../../../pgsql +INCLUDEPATH += $$PWD/../../pgsql +DEPENDPATH += $$PWD/../../pgsql -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/release/libpgsql.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/debug/libpgsql.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/release/pgsql.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/debug/pgsql.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/libpgsql.a +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/libpgsql.a +else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/libpgsql.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/release/pgsql.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/debug/pgsql.lib +else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/libpgsql.a -win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../pglablib/release/ -lpglablib -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../../pglablib/debug/ -lpglablib -else:unix:!macx: LIBS += -L$$OUT_PWD/../../../pglablib/ -lpglablib +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../pglablib/release/ -lpglablib +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pglablib/debug/ -lpglablib +else:unix:!macx: LIBS += -L$$OUT_PWD/../../pglablib/ -lpglablib -INCLUDEPATH += $$PWD/../../../pglablib -DEPENDPATH += $$PWD/../../../pglablib +INCLUDEPATH += $$PWD/../../pglablib +DEPENDPATH += $$PWD/../../pglablib -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/release/libpglablib.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/debug/libpglablib.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/release/pglablib.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/debug/pglablib.lib -else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/libpglablib.a +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/release/libpglablib.a +else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/debug/libpglablib.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/release/pglablib.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/debug/pglablib.lib +else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/libpglablib.a diff --git a/tests/auto/mycase/tst_CsvWriter.h b/tests/pglabtests/tst_CsvWriter.h similarity index 100% rename from tests/auto/mycase/tst_CsvWriter.h rename to tests/pglabtests/tst_CsvWriter.h diff --git a/tests/auto/mycase/tst_ExplainJsonParser.cpp b/tests/pglabtests/tst_ExplainJsonParser.cpp similarity index 100% rename from tests/auto/mycase/tst_ExplainJsonParser.cpp rename to tests/pglabtests/tst_ExplainJsonParser.cpp diff --git a/tests/auto/mycase/tst_ParamJson.cpp b/tests/pglabtests/tst_ParamJson.cpp similarity index 100% rename from tests/auto/mycase/tst_ParamJson.cpp rename to tests/pglabtests/tst_ParamJson.cpp diff --git a/tests/auto/mycase/tst_PasswordManager.h b/tests/pglabtests/tst_PasswordManager.h similarity index 100% rename from tests/auto/mycase/tst_PasswordManager.h rename to tests/pglabtests/tst_PasswordManager.h diff --git a/tests/auto/mycase/tst_SqlLexer.h b/tests/pglabtests/tst_SqlLexer.h similarity index 100% rename from tests/auto/mycase/tst_SqlLexer.h rename to tests/pglabtests/tst_SqlLexer.h diff --git a/tests/auto/mycase/tst_expected.h b/tests/pglabtests/tst_expected.h similarity index 100% rename from tests/auto/mycase/tst_expected.h rename to tests/pglabtests/tst_expected.h diff --git a/tests/auto/mycase/tst_scopeguard.h b/tests/pglabtests/tst_scopeguard.h similarity index 100% rename from tests/auto/mycase/tst_scopeguard.h rename to tests/pglabtests/tst_scopeguard.h diff --git a/tests/tests.pro b/tests/tests.pro index b3fc93a..ee23c08 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += auto \ - PgsqlTests \ +SUBDIRS += PgsqlTests \ + pglabtests \ mygtestutils