Skip to content

Commit 5540f92

Browse files
committed
Support running tests with qemu-user.
1 parent d4c79b1 commit 5540f92

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

tests/test-discard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
#include <cerrno>
2828
#include <cstdio>
29+
#include <cstdlib>
2930
#include <errno.h>
30-
#include <stdlib.h>
3131

3232
static const char input1[8] = "3\xd4\xe2\x84\x83\xc3\x9f";
3333
static const char input2[8] = "3\xe2\x84\x83\xd4\xc3\x9f";

tests/tests.cmake

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ endmacro()
4141
macro(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
)
4646
endmacro(test)
4747

@@ -69,20 +69,20 @@ endif()
6969

7070
# Generate UTF-8 test data.
7171
add_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.
7878
add_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
)
8484
add_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.
9393
add_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
)
9999
add_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

107107
add_test(NAME check-encoding
108108
WORKING_DIRECTORY "${output_testsdir}"
109-
COMMAND "$<TARGET_FILE:check-encoding>"
109+
COMMAND ${EXECUTOR} "$<TARGET_FILE:check-encoding>"
110110
)
111111

112112
add_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

117117
add_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

Comments
 (0)