@@ -41,7 +41,7 @@ endmacro()
4141macro (test state encoding )
4242 add_test ( NAME "check-${state} -${encoding} "
4343 WORKING_DIRECTORY "${output_testsdir} "
44- COMMAND "$<TARGET_FILE:check-${state} >" "${TEST_DATA_DIR} " "${encoding} "
44+ COMMAND ${EXECUTOR} "$<TARGET_FILE:check-${state} >" "${TEST_DATA_DIR} " "${encoding} "
4545 )
4646endmacro (test )
4747
@@ -69,20 +69,20 @@ endif()
6969
7070# Generate UTF-8 test data.
7171add_custom_command (TARGET data-generator POST_BUILD
72- COMMAND "$<TARGET_FILE:data-generator>" "utf-8" > "${TEST_DATA_DIR} /UTF-8.TXT"
72+ COMMAND ${EXECUTOR} "$<TARGET_FILE:data-generator>" "utf-8" > "${TEST_DATA_DIR} /UTF-8.TXT"
7373 WORKING_DIRECTORY "${output_testsdir} "
7474 COMMENT "Generating UTF-8 test data ... "
7575)
7676
7777# Generate GB18030:2005 test data.
7878add_custom_command (TARGET data-generator POST_BUILD
7979 COMMAND "${CMAKE_COMMAND} " -E copy "${TEST_DATA_DIR} /GB18030-2005-BMP.TXT" "${TEST_DATA_DIR} /GB18030-2005.TXT"
80- COMMAND "$<TARGET_FILE:data-generator>" gb18030z >> "${TEST_DATA_DIR} /GB18030-2005.TXT"
80+ COMMAND ${EXECUTOR} "$<TARGET_FILE:data-generator>" gb18030z >> "${TEST_DATA_DIR} /GB18030-2005.TXT"
8181 WORKING_DIRECTORY "${output_testsdir} "
8282 COMMENT "Generating GB18030:2005 test data ... "
8383)
8484add_custom_command (TARGET data-generator POST_BUILD
85- COMMAND "$<TARGET_FILE:sort>" "${TEST_DATA_DIR} /GB18030-2005.TXT" "${TEST_DATA_DIR} /GB18030-2005.TXT.tmp"
85+ COMMAND ${EXECUTOR} "$<TARGET_FILE:sort>" "${TEST_DATA_DIR} /GB18030-2005.TXT" "${TEST_DATA_DIR} /GB18030-2005.TXT.tmp"
8686 COMMAND "${CMAKE_COMMAND} " -E copy "${TEST_DATA_DIR} /GB18030-2005.TXT.tmp" "${TEST_DATA_DIR} /GB18030-2005.TXT"
8787 COMMAND "${CMAKE_COMMAND} " -E remove "${TEST_DATA_DIR} /GB18030-2005.TXT.tmp"
8888 WORKING_DIRECTORY "${output_testsdir} "
@@ -92,12 +92,12 @@ add_custom_command(TARGET data-generator POST_BUILD
9292# Generate GB18030:2022 test data.
9393add_custom_command (TARGET data-generator POST_BUILD
9494 COMMAND "${CMAKE_COMMAND} " -E copy "${TEST_DATA_DIR} /GB18030-2022-BMP.TXT" "${TEST_DATA_DIR} /GB18030-2022.TXT"
95- COMMAND "$<TARGET_FILE:data-generator>" gb18030z >> "${TEST_DATA_DIR} /GB18030-2022.TXT"
95+ COMMAND ${EXECUTOR} "$<TARGET_FILE:data-generator>" gb18030z >> "${TEST_DATA_DIR} /GB18030-2022.TXT"
9696 WORKING_DIRECTORY "${output_testsdir} "
9797 COMMENT "Generating GB18030:2022 test data ... "
9898)
9999add_custom_command (TARGET data-generator POST_BUILD
100- COMMAND "$<TARGET_FILE:sort>" "${TEST_DATA_DIR} /GB18030-2022.TXT" "${TEST_DATA_DIR} /GB18030-2022.TXT.tmp"
100+ COMMAND ${EXECUTOR} "$<TARGET_FILE:sort>" "${TEST_DATA_DIR} /GB18030-2022.TXT" "${TEST_DATA_DIR} /GB18030-2022.TXT.tmp"
101101 COMMAND "${CMAKE_COMMAND} " -E copy "${TEST_DATA_DIR} /GB18030-2022.TXT.tmp" "${TEST_DATA_DIR} /GB18030-2022.TXT"
102102 COMMAND "${CMAKE_COMMAND} " -E remove "${TEST_DATA_DIR} /GB18030-2022.TXT.tmp"
103103 WORKING_DIRECTORY "${output_testsdir} "
@@ -106,17 +106,17 @@ add_custom_command(TARGET data-generator POST_BUILD
106106
107107add_test (NAME check-encoding
108108 WORKING_DIRECTORY "${output_testsdir} "
109- COMMAND "$<TARGET_FILE:check-encoding>"
109+ COMMAND ${EXECUTOR} "$<TARGET_FILE:check-encoding>"
110110 )
111111
112112add_test (NAME test -bom-state
113113 WORKING_DIRECTORY "${output_testsdir} "
114- COMMAND "$<TARGET_FILE:test-bom-state>"
114+ COMMAND ${EXECUTOR} "$<TARGET_FILE:test-bom-state>"
115115 )
116116
117117add_test (NAME test -discard
118118 WORKING_DIRECTORY "${output_testsdir} "
119- COMMAND "$<TARGET_FILE:test-discard>"
119+ COMMAND ${EXECUTOR} "$<TARGET_FILE:test-discard>"
120120 )
121121
122122# General multi-byte encodings.
0 commit comments