WIP, Continue writing additional parser tests, add big object flag to test cmake for mingw

This commit is contained in:
ado 2023-07-31 23:25:47 +02:00
parent 5f46259914
commit 2fe2c391fe
2 changed files with 10 additions and 5 deletions

View File

@ -14,6 +14,8 @@ endif()
if (MSVC) if (MSVC)
add_compile_options(/bigobj) add_compile_options(/bigobj)
elseif (MINGW) ()
add_compile_options(-Wa,-mbig-obj)
endif () endif ()
include(FetchContent) include(FetchContent)

View File

@ -317,7 +317,7 @@ void test_combinations(const std::vector<column>& input_data,
} }
std::vector<int> layout; std::vector<int> layout;
size_t n = 1 + rng.rand() % 10; size_t n = 1 + rng.rand() % 5;
for (size_t i = 0; i < input_data.size(); ++i) { for (size_t i = 0; i < input_data.size(); ++i) {
layout.push_back(i); layout.push_back(i);
@ -570,20 +570,18 @@ void test_combinations_impl() {
template <typename... Ts> template <typename... Ts>
void test_combinations_with_error_options() { void test_combinations_with_error_options() {
test_combinations_impl<Ts...>(); test_combinations_impl<Ts...>();
#ifdef CMAKE_GITHUB_CI
test_combinations_impl<Ts..., ss::string_error>(); test_combinations_impl<Ts..., ss::string_error>();
test_combinations_impl<Ts..., ss::throw_on_error>(); test_combinations_impl<Ts..., ss::throw_on_error>();
#endif
} }
template <typename... Ts> template <typename... Ts>
void test_combinations_with_trim_and_error_options() { void test_combinations_with_trim_and_error_options() {
using trim = ss::trim<' '>; using trim = ss::trim<' '>;
using trimr = ss::trim_right<' '>;
using triml = ss::trim_left<' '>;
test_combinations_with_error_options<Ts...>(); test_combinations_with_error_options<Ts...>();
test_combinations_with_error_options<Ts..., trim>(); test_combinations_with_error_options<Ts..., trim>();
test_combinations_with_error_options<Ts..., trimr>();
test_combinations_with_error_options<Ts..., triml>();
} }
} /* namespace */ } /* namespace */
@ -595,6 +593,8 @@ TEST_CASE("parser test various cases version 2") {
#ifdef CMAKE_GITHUB_CI #ifdef CMAKE_GITHUB_CI
using multiline_r = ss::multiline_restricted<10>; using multiline_r = ss::multiline_restricted<10>;
using trimr = ss::trim_right<' '>;
using triml = ss::trim_left<' '>;
test_combinations_with_trim_and_error_options<>(); test_combinations_with_trim_and_error_options<>();
test_combinations_with_trim_and_error_options<escape>(); test_combinations_with_trim_and_error_options<escape>();
@ -604,6 +604,9 @@ TEST_CASE("parser test various cases version 2") {
test_combinations_with_trim_and_error_options<quote, multiline>(); test_combinations_with_trim_and_error_options<quote, multiline>();
test_combinations_with_trim_and_error_options<escape, quote, multiline>(); test_combinations_with_trim_and_error_options<escape, quote, multiline>();
test_combinations_with_trim_and_error_options<escape, quote, multiline_r>(); test_combinations_with_trim_and_error_options<escape, quote, multiline_r>();
test_combinations_with_error_options<escape, quote, multiline, triml>();
test_combinations_with_error_options<escape, quote, multiline, trimr>();
#else #else
test_combinations_with_trim_and_error_options<escape, quote, multiline>(); test_combinations_with_trim_and_error_options<escape, quote, multiline>();
#endif #endif