diff --git a/Makefile b/Makefile index 198544d..61156ac 100644 --- a/Makefile +++ b/Makefile @@ -43,9 +43,9 @@ testscheck: tests:build ifdef TESTCASE - LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests --gtest_filter=$(TESTCASE).* + LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests $(ARGS) --gtest_filter=$(TESTCASE).* else - LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests + LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/tests/paysages-tests $(ARGS) endif run:build diff --git a/src/common.pri b/src/common.pri index 131b6dd..bf2c489 100644 --- a/src/common.pri +++ b/src/common.pri @@ -1,3 +1,3 @@ CONFIG(release, debug|release): DEFINES += NDEBUG QT_NO_DEBUG_OUTPUT -QMAKE_CXXFLAGS += -std=c++11 +QMAKE_CXXFLAGS += -std=c++14 diff --git a/src/tests/main.cpp b/src/tests/main.cpp index 3b332bb..6ec0fd6 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -10,7 +10,9 @@ int main(int argc, char **argv) { int result; qInstallMessageHandler(noMessageOutput); +#ifdef NDEBUG Logs::disable(); +#endif testing::InitGoogleTest(&argc, argv); result = RUN_ALL_TESTS();