diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2017-11-29 20:34:08 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2017-11-29 20:34:08 +0100 |
| commit | d7fda7b431d7af276d40550630390d5e28461140 (patch) | |
| tree | 65333f5954b261a12b8b4a0a6719825eb26009b4 | |
| parent | 38f717fb6b9838fd30ef1388bc66cd14005309bd (diff) | |
| download | PROJ-d7fda7b431d7af276d40550630390d5e28461140.tar.gz PROJ-d7fda7b431d7af276d40550630390d5e28461140.zip | |
Remove the last remains of the internal selftest
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | nmake.opt | 4 | ||||
| -rwxr-xr-x | travis/install.sh | 4 | ||||
| -rwxr-xr-x | travis/linux_gcc/before_install.sh | 2 |
5 files changed, 5 insertions, 18 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f489f4ed..f6147c3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,15 +58,6 @@ include(Proj4Mac) include(policies) ################################################################################# -# Self-test build config -################################################################################# - -option(SELFTEST "Include self-test in build" OFF) -if(SELFTEST) - add_definitions(-DPJ_SELFTEST) -endif(SELFTEST) - -################################################################################# # threading configuration ################################################################################# set(CMAKE_THREAD_PREFER_PTHREAD TRUE) diff --git a/appveyor.yml b/appveyor.yml index f8bbd7ef..7de5d23c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,10 +31,10 @@ build_script: - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x86" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" x86_amd64 - - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc SELFTEST=1 + - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc - if "%BUILD_TYPE%" == "nmake" nmake /f makefile.vc install-all - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" cd src - - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc SELFTEST=1 multistresstest.exe + - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" nmake /f makefile.vc multistresstest.exe # Disabled for now as it scales badly # - if "%BUILD_TYPE%" == "nmake" if "%platform%" == "x64" multistresstest.exe - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 @@ -28,10 +28,6 @@ OPTFLAGS= /Zi /MDd /Fdproj.pdb !ENDIF !ENDIF -!IFDEF SELFTEST -OPTFLAGS= $(OPTFLAGS) -DPJ_SELFTEST -!ENDIF - # Uncomment the first for linking exes against DLL or second for static EXE_PROJ = proj_i.lib #EXE_PROJ = proj.lib diff --git a/travis/install.sh b/travis/install.sh index 78da24de..8126182b 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -74,9 +74,9 @@ PROJ_LIB=../nad src/multistresstest cd .. # autoconf build with grids and coverage if [ $TRAVIS_OS_NAME == "osx" ]; then - CFLAGS="-DPJ_SELFTEST --coverage" ./configure; + CFLAGS="--coverage" ./configure; else - CFLAGS="-DPJ_SELFTEST --coverage" LDFLAGS="-lgcov" ./configure; + CFLAGS="--coverage" LDFLAGS="-lgcov" ./configure; fi make -j3 make check diff --git a/travis/linux_gcc/before_install.sh b/travis/linux_gcc/before_install.sh index 0c37643c..87877629 100755 --- a/travis/linux_gcc/before_install.sh +++ b/travis/linux_gcc/before_install.sh @@ -4,7 +4,7 @@ sudo apt-get install -y cppcheck -cppcheck --inline-suppr --template='{file}:{line},{severity},{id},{message}' --enable=all --inconclusive --std=posix -DPJ_SELFTEST=1 src/*.c 2>/tmp/cppcheck.txt +cppcheck --inline-suppr --template='{file}:{line},{severity},{id},{message}' --enable=all --inconclusive --std=posix src/*.c 2>/tmp/cppcheck.txt grep "error," /tmp/cppcheck.txt if [[ $? -eq 0 ]] ; then |