eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Folder restructuring of test projects.

Browse source
This commit is contained in:
eelke 2018-01-07 09:15:21 +01:00
parent a79357db87
commit c23282cc7a
13 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pglabAll.pro
View file

@ -15,6 +15,7 @@ pglablib.depends = core pgsql
tests.depends = core pgsql pglablib tests.depends = core pgsql pglablib
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
SUBDIRS += tests SUBDIRS += tests
} }

3
tests/auto/auto.pro
View file

@ -1,3 +0,0 @@
TEMPLATE = subdirs
SUBDIRS += mycase

0
tests/auto/gtest_dependency.pri → tests/pglabtests/gtest_dependency.pri
View file

0
tests/auto/mycase/main.cpp → tests/pglabtests/main.cpp
View file

60
tests/auto/mycase/mycase.pro → tests/pglabtests/pglabtests.pro
View file

@ -1,7 +1,7 @@
include(../gtest_dependency.pri) include(gtest_dependency.pri)
TEMPLATE = app TEMPLATE = app
CONFIG += console c++11 CONFIG += console c++14
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG += thread CONFIG += thread
CONFIG += qt CONFIG += qt
@ -19,44 +19,44 @@ SOURCES += main.cpp \
tst_ExplainJsonParser.cpp \ tst_ExplainJsonParser.cpp \
tst_ParamJson.cpp tst_ParamJson.cpp
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../core/release/ -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 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../core/debug/ -lcore
INCLUDEPATH += C:\prog\include \ INCLUDEPATH += C:\prog\include \
C:\Prog\include\pgsql \ C:\Prog\include\pgsql \
C:\VSproj\boost32\include\boost-1_65_1 C:\VSproj\boost32\include\boost-1_65_1
INCLUDEPATH += $$PWD/../../../core INCLUDEPATH += $$PWD/../../core
DEPENDPATH += $$PWD/../../../core DEPENDPATH += $$PWD/../../core
LIBS += c:\prog\lib\botand_imp.lib LIBS += c:\prog\lib\botand_imp.lib
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../core/release/libcore.a 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-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(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 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 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:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pgsql/debug/ -lpgsql
else:unix:!macx: LIBS += -L$$OUT_PWD/../../../pgsql/ -lpgsql else:unix:!macx: LIBS += -L$$OUT_PWD/../../pgsql/ -lpgsql
INCLUDEPATH += $$PWD/../../../pgsql INCLUDEPATH += $$PWD/../../pgsql
DEPENDPATH += $$PWD/../../../pgsql DEPENDPATH += $$PWD/../../pgsql
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pgsql/release/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-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(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: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 else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pgsql/libpgsql.a
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../../pglablib/release/ -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:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../pglablib/debug/ -lpglablib
else:unix:!macx: LIBS += -L$$OUT_PWD/../../../pglablib/ -lpglablib else:unix:!macx: LIBS += -L$$OUT_PWD/../../pglablib/ -lpglablib
INCLUDEPATH += $$PWD/../../../pglablib INCLUDEPATH += $$PWD/../../pglablib
DEPENDPATH += $$PWD/../../../pglablib DEPENDPATH += $$PWD/../../pglablib
win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../../../pglablib/release/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-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(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: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 else:unix:!macx: PRE_TARGETDEPS += $$OUT_PWD/../../pglablib/libpglablib.a

0
tests/auto/mycase/tst_CsvWriter.h → tests/pglabtests/tst_CsvWriter.h
View file

0
tests/auto/mycase/tst_ExplainJsonParser.cpp → tests/pglabtests/tst_ExplainJsonParser.cpp
View file

0
tests/auto/mycase/tst_ParamJson.cpp → tests/pglabtests/tst_ParamJson.cpp
View file

0
tests/auto/mycase/tst_PasswordManager.h → tests/pglabtests/tst_PasswordManager.h
View file

0
tests/auto/mycase/tst_SqlLexer.h → tests/pglabtests/tst_SqlLexer.h
View file

0
tests/auto/mycase/tst_expected.h → tests/pglabtests/tst_expected.h
View file

0
tests/auto/mycase/tst_scopeguard.h → tests/pglabtests/tst_scopeguard.h
View file

4
tests/tests.pro
View file

@ -1,5 +1,5 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS += auto \ SUBDIRS += PgsqlTests \
PgsqlTests \ pglabtests \
mygtestutils mygtestutils