Skip to content

Commit 22772ea

Browse files
authoredNov 14, 2018
Merge pull request #8483 from 3nids/test_definition
remove definition of ENABLE_TEST in CMake
2 parents 48d498b + b5cad23 commit 22772ea

File tree

5 files changed

+2
-13
lines changed

5 files changed

+2
-13
lines changed
 

‎CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@ SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML director
435435
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
436436
IF (ENABLE_TESTS)
437437
SET( QT_USE_QTTEST TRUE )
438-
ADD_DEFINITIONS(-DENABLE_TESTS)
439438
ENABLE_TESTING()
440439
# Adds some testing specific build targets e.g. make Experimental
441440
INCLUDE(Dart)

‎src/core/qgsmultirenderchecker.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ QString QgsMultiRenderChecker::controlImagePath() const
9999
return myControlImageDir;
100100
}
101101

102-
#ifdef ENABLE_TESTS
103-
104102
//
105103
// QgsLayoutChecker
106104
//
107105

106+
///@cond PRIVATE
107+
108108
QgsLayoutChecker::QgsLayoutChecker( const QString &testName, QgsLayout *layout )
109109
: mTestName( testName )
110110
, mLayout( layout )
@@ -171,5 +171,3 @@ bool QgsLayoutChecker::testLayout( QString &checkedReport, int page, int pixelDi
171171

172172

173173
///@endcond
174-
175-
#endif

‎src/core/qgsmultirenderchecker.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ class CORE_EXPORT QgsMultiRenderChecker
144144
QgsMapSettings mMapSettings;
145145
};
146146

147-
#ifdef ENABLE_TESTS
148147
SIP_FEATURE( TESTS )
149148
SIP_IF_FEATURE( TESTS )
150149

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

199198
SIP_END
200-
#endif
201199

202200

203201
#endif // QGSMULTIRENDERCHECKER_H

‎src/server/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
1010
ADD_DEFINITIONS(-DQGSMSDEBUG=1)
1111
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
1212

13-
IF (ENABLE_TESTS)
14-
ADD_DEFINITIONS(-DENABLE_MS_TESTS=1)
15-
ENDIF (ENABLE_TESTS)
16-
1713
ADD_SUBDIRECTORY(services)
1814

1915
########################################################

‎src/server/qgsserver.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,7 @@ bool QgsServer::init()
239239
//create cache for capabilities XML
240240
sCapabilitiesCache = new QgsCapabilitiesCache();
241241

242-
#ifdef ENABLE_MS_TESTS
243242
QgsFontUtils::loadStandardTestFonts( QStringList() << QStringLiteral( "Roman" ) << QStringLiteral( "Bold" ) );
244-
#endif
245243

246244
sServiceRegistry = new QgsServiceRegistry();
247245

0 commit comments

Comments
 (0)
Please sign in to comment.