Skip to content
Permalink
Browse files

Merge pull request #8483 from 3nids/test_definition

remove definition of ENABLE_TEST in CMake
  • Loading branch information
3nids committed Nov 14, 2018
2 parents 48d498b + b5cad23 commit 22772ea5c9f3876bc6b6ffbc34b8ec1d5bd42c79
@@ -435,7 +435,6 @@ SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
IF (ENABLE_TESTS)
SET( QT_USE_QTTEST TRUE )
ADD_DEFINITIONS(-DENABLE_TESTS)
ENABLE_TESTING()
# Adds some testing specific build targets e.g. make Experimental
INCLUDE(Dart)
@@ -99,12 +99,12 @@ QString QgsMultiRenderChecker::controlImagePath() const
return myControlImageDir;
}

#ifdef ENABLE_TESTS

//
// QgsLayoutChecker
//

///@cond PRIVATE

QgsLayoutChecker::QgsLayoutChecker( const QString &testName, QgsLayout *layout )
: mTestName( testName )
, mLayout( layout )
@@ -171,5 +171,3 @@ bool QgsLayoutChecker::testLayout( QString &checkedReport, int page, int pixelDi


///@endcond

#endif
@@ -144,7 +144,6 @@ class CORE_EXPORT QgsMultiRenderChecker
QgsMapSettings mMapSettings;
};

#ifdef ENABLE_TESTS
SIP_FEATURE( TESTS )
SIP_IF_FEATURE( TESTS )

@@ -197,7 +196,6 @@ class CORE_EXPORT QgsLayoutChecker : public QgsMultiRenderChecker
///@endcond

SIP_END
#endif


#endif // QGSMULTIRENDERCHECKER_H
@@ -10,10 +10,6 @@ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
ADD_DEFINITIONS(-DQGSMSDEBUG=1)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (ENABLE_TESTS)
ADD_DEFINITIONS(-DENABLE_MS_TESTS=1)
ENDIF (ENABLE_TESTS)

ADD_SUBDIRECTORY(services)

########################################################
@@ -239,9 +239,7 @@ bool QgsServer::init()
//create cache for capabilities XML
sCapabilitiesCache = new QgsCapabilitiesCache();

#ifdef ENABLE_MS_TESTS
QgsFontUtils::loadStandardTestFonts( QStringList() << QStringLiteral( "Roman" ) << QStringLiteral( "Bold" ) );
#endif

sServiceRegistry = new QgsServiceRegistry();

0 comments on commit 22772ea

Please sign in to comment.
You can’t perform that action at this time.