build: use generator expression for path computation

Use generator expressions to compute the path rather than hardcoding the layout. Finally, clean up some unnecessary quoting and uniformly spell commands in the tests.
commonmark · Dec 27, 2023 · b3efa6c · b3efa6c
1 parent a2681c8
commit b3efa6c
Showing 1 changed file with 8 additions and 19 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -22,48 +22,37 @@ endif()
 IF (Python3_Interpreter_FOUND)
 
   add_test(NAME html_normalization COMMAND
-    $<TARGET_FILE:Python3::Interpreter> "-m" "doctest"
-    "${CMAKE_CURRENT_SOURCE_DIR}/normalize.py"
+    "$<TARGET_FILE:Python3::Interpreter>" -m doctest "${CMAKE_CURRENT_SOURCE_DIR}/normalize.py"
     )
 
   if (CMARK_SHARED)
     add_test(NAME spectest_library COMMAND
-      $<TARGET_FILE:Python3::Interpreter> "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
-      "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" --no-normalize --spec "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" --library-dir "$<TARGET_FILE_DIR:cmark>"
       )
 
     add_test(NAME pathological_tests_library COMMAND
-      $<TARGET_FILE:Python3::Interpreter> "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py"
-      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/pathological_tests.py" --library-dir "$<TARGET_FILE_DIR:cmark>"
       )
 
     add_test(NAME roundtriptest_library COMMAND
-      $<TARGET_FILE:Python3::Interpreter>
-      "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
-      "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt"
-      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py" --spec "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" --library-dir "$<TARGET_FILE_DIR:cmark>"
       )
 
     add_test(NAME entity_library COMMAND
-      $<TARGET_FILE:Python3::Interpreter>
-      "${CMAKE_CURRENT_SOURCE_DIR}/entity_tests.py"
-      "--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
+      "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/entity_tests.py" --library-dir "$<TARGET_FILE_DIR:cmark>"
       )
   endif()
 
   add_test(NAME spectest_executable COMMAND
-    $<TARGET_FILE:Python3::Interpreter> "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" --no-normalize --spec "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt" --program "$<TARGET_FILE:cmark_exe>"
     )
 
   add_test(NAME smartpuncttest_executable COMMAND
-    $<TARGET_FILE:Python3::Interpreter> "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec" "${CMAKE_CURRENT_SOURCE_DIR}/smart_punct.txt" "--program" "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark --smart"
+    "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" --no-normalize --spec "${CMAKE_CURRENT_SOURCE_DIR}/smart_punct.txt" --program "$<TARGET_FILE:cmark_exe> --smart"
     )
 
   add_test(NAME regressiontest_executable COMMAND
-    $<TARGET_FILE:Python3::Interpreter>
-    "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" "--no-normalize" "--spec"
-    "${CMAKE_CURRENT_SOURCE_DIR}/regression.txt" "--program"
-    "${CMAKE_CURRENT_BINARY_DIR}/../src/cmark"
+    "$<TARGET_FILE:Python3::Interpreter>" "${CMAKE_CURRENT_SOURCE_DIR}/spec_tests.py" --no-normalize --spec "${CMAKE_CURRENT_SOURCE_DIR}/regression.txt" --program "$<TARGET_FILE:cmark_exe>"
     )
 
 ELSE(Python3_Interpreter_FOUND)