cmake: Rename WITH_CLIENT_TESTING option to CLIENT_TESTING

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2018-06-29 10:31:09 +02:00 · 2018-06-29 10:31:09 +02:00 · 946f8f64ef
commit 946f8f64ef
parent 84ac7d1de0
5 changed files with 15 additions and 15 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -21,7 +21,7 @@ debian/openssl_1.0.x/aarch64:
    paths:
      - build/

-# torture_auth fails on centos7 docker images, so we don't use -DWITH_CLIENT_TESTING=ON
+# torture_auth fails on centos7 docker images, so we don't use -DCLIENT_TESTING=ON
 centos7/openssl_1.0.x/x86-64:
  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS7_BUILD
  script:
@ -42,7 +42,7 @@ fedora/openssl_1.1.x/x86-64:
  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
  script:
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -61,7 +61,7 @@ fedora/openssl_1.1.x/x86-64:
  - export CFLAGS="-fsanitize=address -g -O2"
  - export LDFLAGS="-fsanitize=address -static-libasan"
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -78,7 +78,7 @@ fedora/undefined-sanitizer:
  script:
  - export CFLAGS="-fsanitize=undefined -fsanitize=null -fsanitize=alignment -fno-sanitize-recover"
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -96,7 +96,7 @@ fedora/static-analysis:
  - export CCC_CC=clang
  - export CCC_CXX=clang++
  - mkdir -p obj && cd obj && scan-build cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang .. &&
    scan-build --status-bugs -o scan make -j$(nproc)
  tags:
@ -132,7 +132,7 @@ fedora/libgcrypt/x86-64:
  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
  script:
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_GCRYPT=ON
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -148,7 +148,7 @@ fedora/mbedtls/x86-64:
  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
  script:
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug -DWITH_MBEDTLS=ON
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -164,7 +164,7 @@ tumbleweed/openssl_1.1.x/x86-64:
  image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$TUMBLEWEED_BUILD
  script:
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -181,7 +181,7 @@ tumbleweed/undefined-sanitizer:
  script:
  - export CFLAGS="-fsanitize=undefined -fsanitize=null -fsanitize=alignment -fno-sanitize-recover"
  - mkdir -p obj && cd obj && cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON .. && make -j$(nproc) && ctest --output-on-failure
  tags:
  - shared
@ -199,7 +199,7 @@ tumbleweed/static-analysis:
  - export CCC_CC=clang
  - export CCC_CXX=clang++
  - mkdir -p obj && cd obj && scan-build cmake -DUNIT_TESTING=ON -DCMAKE_BUILD_TYPE=Debug
-    -DWITH_CLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
+    -DCLIENT_TESTING=ON -DWITH_SFTP=ON -DWITH_SERVER=ON -DWITH_ZLIB=ON
    -DWITH_PCAP=ON -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang .. &&
    scan-build --status-bugs -o scan make -j$(nproc)
  tags:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -167,7 +167,7 @@ message(STATUS "GSSAPI support : ${WITH_GSSAPI}")
 message(STATUS "Pcap debugging support : ${WITH_PCAP}")
 message(STATUS "With static library: ${WITH_STATIC_LIB}")
 message(STATUS "Unit testing: ${UNIT_TESTING}")
-message(STATUS "Client code Unit testing: ${WITH_CLIENT_TESTING}")
+message(STATUS "Client code Unit testing: ${CLIENT_TESTING}")
 if (WITH_INTERNAL_DOC)
    message(STATUS "Internal documentation generation")
 else (WITH_INTERNAL_DOC)
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@ -12,7 +12,7 @@ option(WITH_MBEDTLS "Compile against libmbedtls" OFF)
 option(WITH_PCAP "Compile with Pcap generation support" ON)
 option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF)
 option(UNIT_TESTING "Build with unit tests" OFF)
-option(WITH_CLIENT_TESTING "Build with client tests; requires a running sshd" OFF)
+option(CLIENT_TESTING "Build with client tests; requires openssh" OFF)
 option(WITH_BENCHMARKS "Build benchmarks tools" OFF)
 option(WITH_EXAMPLES "Build examples" ON)
 option(WITH_NACL "Build with libnacl (curve25519)" ON)
--- a/obj/build_make.sh
+++ b/obj/build_make.sh
@ -140,7 +140,7 @@ while test -n "$1"; do
 			OPTIONS="${OPTIONS} -DUNIT_TESTING=ON"
 		;;
 		*-clientunittesting)
-			OPTIONS="${OPTIONS} -DWITH_CLIENT_TESTING=ON"
+			OPTIONS="${OPTIONS} -DCLIENT_TESTING=ON"
 		;;
 		*-withssh1)
 			OPTIONS="${OPTIONS} -DWITH_SSH1=ON"
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -51,7 +51,7 @@ set(TEST_TARGET_LIBRARIES

 add_subdirectory(unittests)

-if (WITH_CLIENT_TESTING)
+if (CLIENT_TESTING)
    find_package(socket_wrapper 1.1.5 REQUIRED)
    find_package(nss_wrapper 1.1.2 REQUIRED)
    find_package(uid_wrapper 1.2.0 REQUIRED)
@ -129,7 +129,7 @@ if (WITH_CLIENT_TESTING)
    message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")

    add_subdirectory(client)
-endif (WITH_CLIENT_TESTING)
+endif (CLIENT_TESTING)

 if (WITH_BENCHMARKS)
    add_subdirectory(benchmarks)