Skip to content

Commit 9244377

Browse files
committed
Enable all acceptance tests on mingw
1 parent 041d59c commit 9244377

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.github/workflows/mingw-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
cd build32
6363
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
6464
cmake --build . --target acceptance_tests --verbose
65-
ctest -L acceptance -LE no_mingw --output-on-failure
65+
ctest -L acceptance --output-on-failure

.github/workflows/mingw64-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
cd build64
6363
cmake -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
6464
cmake --build . --target acceptance_tests --verbose
65-
ctest -L acceptance -LE no_mingw --output-on-failure
65+
ctest -L acceptance --output-on-failure
6666
cd ..
6767
mkdir build64debug
6868
cd build64debug
6969
cmake -DCMAKE_BUILD_TYPE=Debug -DSIMDJSON_BUILD_STATIC=ON -DSIMDJSON_COMPETITION=OFF -DSIMDJSON_GOOGLE_BENCHMARKS=OFF -DSIMDJSON_ENABLE_THREADS=OFF ..
7070
cmake --build . --target acceptance_tests --verbose
71-
ctest -L acceptance -LE no_mingw --output-on-failure
71+
ctest -L acceptance --output-on-failure

tests/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ target_compile_definitions(stringparsingcheck PRIVATE NOMINMAX)
1919

2020
# All remaining tests link with simdjson proper
2121
link_libraries(simdjson)
22-
add_cpp_test(random_string_number_tests LABELS dom acceptance per_implementation no_mingw)
22+
add_cpp_test(random_string_number_tests LABELS dom acceptance per_implementation)
2323
add_cpp_test(basictests LABELS dom acceptance per_implementation)
24-
add_cpp_test(document_stream_tests LABELS dom acceptance per_implementation no_mingw)
25-
add_cpp_test(document_tests LABELS dom acceptance per_implementation no_mingw)
24+
add_cpp_test(document_stream_tests LABELS dom acceptance per_implementation)
25+
add_cpp_test(document_tests LABELS dom acceptance per_implementation)
2626
add_cpp_test(errortests LABELS dom acceptance per_implementation)
27-
add_cpp_test(extracting_values_example LABELS dom acceptance per_implementation no_mingw)
27+
add_cpp_test(extracting_values_example LABELS dom acceptance per_implementation)
2828
add_cpp_test(integer_tests LABELS dom acceptance per_implementation)
2929
add_cpp_test(jsoncheck LABELS dom acceptance per_implementation)
30-
add_cpp_test(minefieldcheck LABELS dom acceptance per_implementation no_mingw)
30+
add_cpp_test(minefieldcheck LABELS dom acceptance per_implementation)
3131
add_cpp_test(parse_many_test LABELS dom acceptance per_implementation)
3232
add_cpp_test(pointercheck LABELS dom acceptance per_implementation) # https://tools.ietf.org/html/rfc6901
33-
add_cpp_test(unicode_tests LABELS dom acceptance per_implementation no_mingw)
33+
add_cpp_test(unicode_tests LABELS dom acceptance per_implementation)
3434

35-
add_cpp_test(minify_tests LABELS other acceptance per_implementation no_mingw)
36-
add_cpp_test(padded_string_tests LABELS other acceptance no_mingw)
35+
add_cpp_test(minify_tests LABELS other acceptance per_implementation)
36+
add_cpp_test(padded_string_tests LABELS other acceptance )
3737

3838
find_program(BASH bash)
3939

@@ -78,7 +78,7 @@ if (BASH AND (NOT WIN32) AND SIMDJSON_BASH AND (TARGET json2json)) # The scripts
7878
add_cpp_test(checkimplementation LABELS other per_implementation)
7979

8080
add_test(NAME json2json COMMAND $<TARGET_FILE:json2json> ${EXAMPLE_JSON})
81-
set_property(TEST json2json APPEND PROPERTY LABELS acceptance per_implementation no_mingw)
81+
set_property(TEST json2json APPEND PROPERTY LABELS acceptance per_implementation)
8282

8383
#
8484
# SIMDJSON_FORCE_IMPLEMENTATION tests: run json2json with SIMDJSON
@@ -109,18 +109,18 @@ endif()
109109
# Don't add the tests if we're on VS2017 or older; they don't succeed.
110110
if(NOT (MSVC AND MSVC_VERSION LESS 1920))
111111
if(SIMDJSON_EXCEPTIONS)
112-
add_cpp_test(readme_examples COMPILE_ONLY LABELS acceptance no_mingw)
113-
add_cpp_test(readme_examples11 COMPILE_ONLY LABELS acceptance no_mingw SOURCES readme_examples.cpp)
112+
add_cpp_test(readme_examples COMPILE_ONLY LABELS acceptance)
113+
add_cpp_test(readme_examples11 COMPILE_ONLY LABELS acceptance SOURCES readme_examples.cpp)
114114
set_target_properties(readme_examples11 PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
115115
endif()
116116

117-
add_cpp_test(readme_examples_noexceptions COMPILE_ONLY LABELS acceptance no_mingw)
117+
add_cpp_test(readme_examples_noexceptions COMPILE_ONLY LABELS acceptance)
118118

119-
add_cpp_test(readme_examples_noexceptions11 COMPILE_ONLY LABELS acceptance no_mingw SOURCES readme_examples_noexceptions.cpp)
119+
add_cpp_test(readme_examples_noexceptions11 COMPILE_ONLY LABELS acceptance SOURCES readme_examples_noexceptions.cpp)
120120
set_target_properties(readme_examples_noexceptions11 PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
121121

122122
# Compile tests that *should fail*
123-
add_cpp_test(readme_examples_will_fail_with_exceptions_off WILL_FAIL COMPILE_ONLY LABELS acceptance no_mingw SOURCES readme_examples.cpp)
123+
add_cpp_test(readme_examples_will_fail_with_exceptions_off WILL_FAIL COMPILE_ONLY LABELS acceptance SOURCES readme_examples.cpp)
124124
target_compile_definitions(readme_examples_will_fail_with_exceptions_off PRIVATE SIMDJSON_EXCEPTIONS=0)
125125
endif()
126126

0 commit comments

Comments
 (0)