Merge topic 'remove-cmakeserverlib-references'

bf7e3124cb Remove stale references to CMakeServerLib

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !7537

.gitlab/os-linux.yml

@@ -481,7 +481,7 @@
         # use the scripts here.
         - "$LAUNCHER make -j$(nproc)"
         # NOTE: This regex matches that used in the release build.
-        - "$LAUNCHER bin/ctest --output-on-failure -j$(nproc) -R '^(CMake\\.|CMakeLib\\.|CMakeServerLib\\.|RunCMake\\.ctest_memcheck)'"
+        - "$LAUNCHER bin/ctest --output-on-failure -j$(nproc) -R '^(CMake\\.|CMakeLib\\.|RunCMake\\.ctest_memcheck)'"
         # Make a package.
         - bin/cpack -G TGZ
         - bin/cpack -G STGZ

CMakeLists.txt

@@ -883,9 +883,6 @@ add_subdirectory(Tests)
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   if(BUILD_TESTING)
     CMAKE_SET_TARGET_FOLDER(CMakeLibTests "Tests")
-    IF(TARGET CMakeServerLibTests)
-      CMAKE_SET_TARGET_FOLDER(CMakeServerLibTests "Tests")
-    ENDIF()
   endif()
   if(TARGET documentation)
     CMAKE_SET_TARGET_FOLDER(documentation "Documentation")

Utilities/Release/linux/aarch64/Dockerfile

@@ -25,7 +25,7 @@ RUN : \
  && nice make -j $(nproc) \
  && if $TEST; then \
         # Run tests that require the full build tree.
-        bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|CMakeServerLib\.|RunCMake\.ctest_memcheck)'; \
+        bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|RunCMake\.ctest_memcheck)'; \
     fi \
  && bin/cpack -G TGZ \
  && bin/cpack -G STGZ \

Utilities/Release/linux/x86_64/Dockerfile

@@ -26,7 +26,7 @@ RUN : \
  && nice make -j $(nproc) \
  && if $TEST; then \
         # Run tests that require the full build tree.
-        bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|CMakeServerLib\.|RunCMake\.ctest_memcheck)'; \
+        bin/ctest --output-on-failure -j 8 -R '^(CMake\.|CMakeLib\.|RunCMake\.ctest_memcheck)'; \
     fi \
  && bin/cpack -G TGZ \
  && bin/cpack -G STGZ \