svn commit: r1920846 - /subversion/trunk/CMakeLists.txt

Author: jun66j5
Date: Mon Sep 23 04:15:22 2024
New Revision: 1920846

URL: http://svn.apache.org/viewvc?rev=1920846&view=rev
Log:
cmake: Follow-up to r1920768, use glob pattern "cmdline/*_tests.py" which is
used in build.conf rather than filtering "svneditor" from test scripts.

* CMakeLists.txt
  (pytests): Revert r1920768 and change glob pattern for test scripts.

Modified:
    subversion/trunk/CMakeLists.txt

Modified: subversion/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/trunk/CMakeLists.txt?rev=1920846&r1=1920845&r2=1920846&view=diff
==============================================================================
--- subversion/trunk/CMakeLists.txt (original)
+++ subversion/trunk/CMakeLists.txt Mon Sep 23 04:15:22 2024
@@ -662,29 +662,27 @@ if(SVN_ENABLE_TESTS)
   find_package(Python3 COMPONENTS Interpreter REQUIRED)
 
   file(GLOB PYTHON_TESTS
-     "subversion/tests/cmdline/*.py"
+     "subversion/tests/cmdline/*_tests.py"
   )
 
   foreach(py_test_path ${PYTHON_TESTS})
     # Keep `.py'.
     get_filename_component(py_test_name ${py_test_path} NAME_WLE)
 
-    if(NOT ${py_test_name} STREQUAL "svneditor")
-      add_test(
-        NAME
-          "cmdline.${py_test_name}"
-        COMMAND
-          "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
-          --bin ${CMAKE_CURRENT_BINARY_DIR}
-          --tools-bin ${CMAKE_CURRENT_BINARY_DIR}
-          --verbose
-          --log-to-stdout
-          --set-log-level=WARNING
-          ${CMAKE_CURRENT_SOURCE_DIR}
-          ${CMAKE_CURRENT_BINARY_DIR}
-          ${py_test_path}
-      )
-    endif()
+    add_test(
+      NAME
+        "cmdline.${py_test_name}"
+      COMMAND
+        "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/build/run_tests.py"
+        --bin ${CMAKE_CURRENT_BINARY_DIR}
+        --tools-bin ${CMAKE_CURRENT_BINARY_DIR}
+        --verbose
+        --log-to-stdout
+        --set-log-level=WARNING
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_BINARY_DIR}
+        ${py_test_path}
+    )
   endforeach()
 endif()