From a30f84e0e0294bea6cb052cf20cf4bee1be7a36e Mon Sep 17 00:00:00 2001 From: Nana Sakisaka <1901813+saki7@users.noreply.github.com> Date: Sat, 7 Feb 2026 21:09:28 +0900 Subject: [PATCH] Organize test sources Companion fix for iris-cpp/iris#17 --- CMakeLists.txt | 9 ++++++++- modules/iris | 2 +- test/x4/CMakeLists.txt | 2 ++ test/x4/actions.cpp | 2 +- test/x4/alternative.cpp | 2 +- test/x4/and_predicate.cpp | 2 +- test/x4/as.cpp | 2 +- test/x4/attr.cpp | 2 +- test/x4/attribute.cpp | 2 +- test/x4/attribute_type_check.cpp | 2 +- test/x4/bool.cpp | 2 +- test/x4/char.cpp | 2 +- test/x4/char_class.cpp | 2 +- test/x4/container_support.cpp | 2 +- test/x4/context.cpp | 2 +- test/x4/debug.cpp | 2 +- test/x4/difference.cpp | 2 +- test/x4/eoi.cpp | 2 +- test/x4/eol.cpp | 2 +- test/x4/eps.cpp | 2 +- test/x4/error_handler.cpp | 2 +- test/x4/expect.cpp | 2 +- test/x4/extract_int.cpp | 2 +- test/x4/grammar.hpp | 2 +- test/x4/grammar_linker.cpp | 2 +- test/x4/int.cpp | 2 +- test/x4/{test.hpp => iris_x4_test.hpp} | 9 ++++----- test/x4/iterator.cpp | 2 +- test/x4/kleene.cpp | 2 +- test/x4/lexeme.cpp | 2 +- test/x4/list.cpp | 2 +- test/x4/lit.cpp | 2 +- test/x4/matches.cpp | 2 +- test/x4/no_case.cpp | 2 +- test/x4/no_skip.cpp | 2 +- test/x4/not_predicate.cpp | 2 +- test/x4/omit.cpp | 2 +- test/x4/optional.cpp | 2 +- test/x4/parser.cpp | 2 +- test/x4/plus.cpp | 2 +- test/x4/raw.cpp | 2 +- test/x4/real.hpp | 2 +- test/x4/repeat.cpp | 2 +- test/x4/rule1.cpp | 2 +- test/x4/rule2.cpp | 2 +- test/x4/rule3.cpp | 2 +- test/x4/rule4.cpp | 2 +- test/x4/rule_separate_tu_grammar.hpp | 2 +- test/x4/seek.cpp | 2 +- test/x4/sequence.cpp | 2 +- test/x4/skip.cpp | 2 +- test/x4/symbols1.cpp | 2 +- test/x4/symbols2.cpp | 2 +- test/x4/symbols3.cpp | 2 +- test/x4/to_utf8.cpp | 2 +- test/x4/tst.cpp | 2 +- test/x4/uint.cpp | 2 +- test/x4/uint_radix.cpp | 2 +- test/x4/unused.cpp | 2 +- test/x4/with.cpp | 2 +- test/x4/with_local.cpp | 2 +- test/x4/x3_rule_problem.cpp | 2 +- 62 files changed, 73 insertions(+), 65 deletions(-) rename test/x4/{test.hpp => iris_x4_test.hpp} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d15c82a8a..59b14af6f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,11 @@ if(PROJECT_IS_TOP_LEVEL) include(CTest) # sets BUILD_TESTING endif() -add_subdirectory(modules/iris) +if(NOT DEFINED IRIS_ROOT) + set(IRIS_ROOT "${CMAKE_CURRENT_LIST_DIR}/modules/iris") +endif() + +add_subdirectory("${IRIS_ROOT}") # ----------------------------------------------------------------- @@ -97,6 +101,9 @@ foreach(dep IN LISTS iris_x4_boost_deps) add_subdirectory(../${dep} build_deps/${dep}) endforeach() +set_target_properties(boost_assert PROPERTIES FOLDER "_deps") +set_target_properties(boost_core PROPERTIES FOLDER "_deps") + foreach(dep IN LISTS iris_x4_boost_deps) target_link_libraries(iris_x4 INTERFACE Boost::${dep}) endforeach() diff --git a/modules/iris b/modules/iris index 7670a27a5..b78298e0f 160000 --- a/modules/iris +++ b/modules/iris @@ -1 +1 @@ -Subproject commit 7670a27a52fa98e2d726fae1a425bd94806d42ab +Subproject commit b78298e0f67b7c22b01039d2f5c6dbb58eecfcc7 diff --git a/test/x4/CMakeLists.txt b/test/x4/CMakeLists.txt index 80fd923a8..d2dec5bfe 100644 --- a/test/x4/CMakeLists.txt +++ b/test/x4/CMakeLists.txt @@ -10,6 +10,7 @@ endfunction() function(x4_define_test test_name) iris_define_test(x4_${test_name} ${ARGN}) + iris_define_test_headers(x4_${test_name} iris_x4_test.hpp) target_link_libraries(x4_${test_name}_test PRIVATE Iris::X4) if(MSVC) @@ -27,6 +28,7 @@ endfunction() function(x4_define_tests) foreach(test_name IN LISTS ARGV) x4_define_test(${test_name} ${test_name}.cpp) + set_target_properties(x4_${test_name}_test PROPERTIES FOLDER "test/x4") endforeach() endfunction() diff --git a/test/x4/actions.cpp b/test/x4/actions.cpp index 0fd94cb70..dd4aa10e6 100644 --- a/test/x4/actions.cpp +++ b/test/x4/actions.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/alternative.cpp b/test/x4/alternative.cpp index be45739c0..da0184c64 100644 --- a/test/x4/alternative.cpp +++ b/test/x4/alternative.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/and_predicate.cpp b/test/x4/and_predicate.cpp index a61f74afe..0a7e0a90f 100644 --- a/test/x4/and_predicate.cpp +++ b/test/x4/and_predicate.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/as.cpp b/test/x4/as.cpp index 83aca82aa..1b7c2a2ea 100644 --- a/test/x4/as.cpp +++ b/test/x4/as.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/attr.cpp b/test/x4/attr.cpp index 750b6a907..b2a0463e8 100644 --- a/test/x4/attr.cpp +++ b/test/x4/attr.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/attribute.cpp b/test/x4/attribute.cpp index 89c6f64cc..3739107b7 100644 --- a/test/x4/attribute.cpp +++ b/test/x4/attribute.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/attribute_type_check.cpp b/test/x4/attribute_type_check.cpp index 35f2f053d..e153f446a 100644 --- a/test/x4/attribute_type_check.cpp +++ b/test/x4/attribute_type_check.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/bool.cpp b/test/x4/bool.cpp index c409117f7..f46949379 100644 --- a/test/x4/bool.cpp +++ b/test/x4/bool.cpp @@ -10,7 +10,7 @@ #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/char.cpp b/test/x4/char.cpp index 55f3990eb..08ccc53b6 100644 --- a/test/x4/char.cpp +++ b/test/x4/char.cpp @@ -11,7 +11,7 @@ #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/char_class.cpp b/test/x4/char_class.cpp index 2f0a7aa4a..4f1269078 100644 --- a/test/x4/char_class.cpp +++ b/test/x4/char_class.cpp @@ -10,7 +10,7 @@ #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/container_support.cpp b/test/x4/container_support.cpp index 794fb498b..c6ea8ccee 100644 --- a/test/x4/container_support.cpp +++ b/test/x4/container_support.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/context.cpp b/test/x4/context.cpp index 5da8a03d9..92bf94439 100644 --- a/test/x4/context.cpp +++ b/test/x4/context.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/debug.cpp b/test/x4/debug.cpp index 3360b303c..5701e9f52 100644 --- a/test/x4/debug.cpp +++ b/test/x4/debug.cpp @@ -9,7 +9,7 @@ #define IRIS_X4_DEBUG -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/difference.cpp b/test/x4/difference.cpp index 4946a2b0a..dc6543266 100644 --- a/test/x4/difference.cpp +++ b/test/x4/difference.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/eoi.cpp b/test/x4/eoi.cpp index 2d80e686c..9ac6880d8 100644 --- a/test/x4/eoi.cpp +++ b/test/x4/eoi.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/eol.cpp b/test/x4/eol.cpp index 64274d562..792c6cd0a 100644 --- a/test/x4/eol.cpp +++ b/test/x4/eol.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/eps.cpp b/test/x4/eps.cpp index 4f7f9bd98..6d05a0c3f 100644 --- a/test/x4/eps.cpp +++ b/test/x4/eps.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/error_handler.cpp b/test/x4/error_handler.cpp index b5393bba4..37b022320 100644 --- a/test/x4/error_handler.cpp +++ b/test/x4/error_handler.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/expect.cpp b/test/x4/expect.cpp index 1ea0b9781..341ed37a7 100644 --- a/test/x4/expect.cpp +++ b/test/x4/expect.cpp @@ -13,7 +13,7 @@ # pragma warning(disable: 6262) // Function uses 'XXXXX' bytes of stack #endif -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/extract_int.cpp b/test/x4/extract_int.cpp index 987a55048..76b87c360 100644 --- a/test/x4/extract_int.cpp +++ b/test/x4/extract_int.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/grammar.hpp b/test/x4/grammar.hpp index 4b93d0590..0df783f53 100644 --- a/test/x4/grammar.hpp +++ b/test/x4/grammar.hpp @@ -11,7 +11,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/grammar_linker.cpp b/test/x4/grammar_linker.cpp index 13f55ac59..b593a19c8 100644 --- a/test/x4/grammar_linker.cpp +++ b/test/x4/grammar_linker.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include "grammar.hpp" TEST_CASE("grammar") diff --git a/test/x4/int.cpp b/test/x4/int.cpp index 5b37b9e47..9f3ac3fc9 100644 --- a/test/x4/int.cpp +++ b/test/x4/int.cpp @@ -9,7 +9,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/test.hpp b/test/x4/iris_x4_test.hpp similarity index 97% rename from test/x4/test.hpp rename to test/x4/iris_x4_test.hpp index cc7a1d75d..34e42c737 100644 --- a/test/x4/test.hpp +++ b/test/x4/iris_x4_test.hpp @@ -1,5 +1,5 @@ -#ifndef IRIS_X4_TEST_X4_TEST_HPP -#define IRIS_X4_TEST_X4_TEST_HPP +#ifndef IRIS_X4_TEST_IRIS_X4_TEST_HPP +#define IRIS_X4_TEST_IRIS_X4_TEST_HPP /*============================================================================= Copyright (c) 2001-2013 Joel de Guzman @@ -11,13 +11,12 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include +#include "iris_test.hpp" + #include #include #include -#include - #include #include #include diff --git a/test/x4/iterator.cpp b/test/x4/iterator.cpp index cdca8e1d5..193bb8a75 100644 --- a/test/x4/iterator.cpp +++ b/test/x4/iterator.cpp @@ -10,7 +10,7 @@ #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/kleene.cpp b/test/x4/kleene.cpp index 4d325c616..789244748 100644 --- a/test/x4/kleene.cpp +++ b/test/x4/kleene.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/lexeme.cpp b/test/x4/lexeme.cpp index e6a7b7159..97f0acd0d 100644 --- a/test/x4/lexeme.cpp +++ b/test/x4/lexeme.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/list.cpp b/test/x4/list.cpp index 64e9a7031..a19c20fb1 100644 --- a/test/x4/list.cpp +++ b/test/x4/list.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/lit.cpp b/test/x4/lit.cpp index ada8ff01a..6312820d0 100644 --- a/test/x4/lit.cpp +++ b/test/x4/lit.cpp @@ -10,7 +10,7 @@ #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/matches.cpp b/test/x4/matches.cpp index 053374acc..8b992d410 100644 --- a/test/x4/matches.cpp +++ b/test/x4/matches.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/no_case.cpp b/test/x4/no_case.cpp index 23ba90191..74301f6b2 100644 --- a/test/x4/no_case.cpp +++ b/test/x4/no_case.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/no_skip.cpp b/test/x4/no_skip.cpp index 4e6197490..c5a1b7746 100644 --- a/test/x4/no_skip.cpp +++ b/test/x4/no_skip.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/not_predicate.cpp b/test/x4/not_predicate.cpp index 32315d748..b18c8719b 100644 --- a/test/x4/not_predicate.cpp +++ b/test/x4/not_predicate.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/omit.cpp b/test/x4/omit.cpp index 75e754e99..9d09141d5 100644 --- a/test/x4/omit.cpp +++ b/test/x4/omit.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/optional.cpp b/test/x4/optional.cpp index 41d60c9f7..4ff1bb769 100644 --- a/test/x4/optional.cpp +++ b/test/x4/optional.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/parser.cpp b/test/x4/parser.cpp index 830b70a6e..2f6924733 100644 --- a/test/x4/parser.cpp +++ b/test/x4/parser.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/plus.cpp b/test/x4/plus.cpp index 502b6d921..12abab392 100644 --- a/test/x4/plus.cpp +++ b/test/x4/plus.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/raw.cpp b/test/x4/raw.cpp index 99e7ee28a..010c0b7f4 100644 --- a/test/x4/raw.cpp +++ b/test/x4/raw.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/real.hpp b/test/x4/real.hpp index 6aecbcd6a..fc2e2e6b2 100644 --- a/test/x4/real.hpp +++ b/test/x4/real.hpp @@ -11,7 +11,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/repeat.cpp b/test/x4/repeat.cpp index e035ba537..59b047758 100644 --- a/test/x4/repeat.cpp +++ b/test/x4/repeat.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/rule1.cpp b/test/x4/rule1.cpp index bb942b585..ebc04f753 100644 --- a/test/x4/rule1.cpp +++ b/test/x4/rule1.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/rule2.cpp b/test/x4/rule2.cpp index a368c4b94..d38aff9e6 100644 --- a/test/x4/rule2.cpp +++ b/test/x4/rule2.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/rule3.cpp b/test/x4/rule3.cpp index 2d24792e0..6b2442f56 100644 --- a/test/x4/rule3.cpp +++ b/test/x4/rule3.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/rule4.cpp b/test/x4/rule4.cpp index 8c65f9ce0..cf071a44d 100644 --- a/test/x4/rule4.cpp +++ b/test/x4/rule4.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/rule_separate_tu_grammar.hpp b/test/x4/rule_separate_tu_grammar.hpp index 5c0a8b257..2641cf3f8 100644 --- a/test/x4/rule_separate_tu_grammar.hpp +++ b/test/x4/rule_separate_tu_grammar.hpp @@ -10,7 +10,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/seek.cpp b/test/x4/seek.cpp index 26eb082f9..561b0e0f9 100644 --- a/test/x4/seek.cpp +++ b/test/x4/seek.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/sequence.cpp b/test/x4/sequence.cpp index 60ac50f69..c0f9e4bd2 100644 --- a/test/x4/sequence.cpp +++ b/test/x4/sequence.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/skip.cpp b/test/x4/skip.cpp index f371fb0bd..4d76f9558 100644 --- a/test/x4/skip.cpp +++ b/test/x4/skip.cpp @@ -8,7 +8,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/symbols1.cpp b/test/x4/symbols1.cpp index 048c30a60..d2bd863c4 100644 --- a/test/x4/symbols1.cpp +++ b/test/x4/symbols1.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/symbols2.cpp b/test/x4/symbols2.cpp index c963dea07..9f1495b0a 100644 --- a/test/x4/symbols2.cpp +++ b/test/x4/symbols2.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/symbols3.cpp b/test/x4/symbols3.cpp index 3f6ce634a..fd2fa5ad4 100644 --- a/test/x4/symbols3.cpp +++ b/test/x4/symbols3.cpp @@ -11,7 +11,7 @@ #define IRIS_X4_DEBUG #define IRIS_X4_UNICODE -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/to_utf8.cpp b/test/x4/to_utf8.cpp index babbff4c9..a5f3263c0 100644 --- a/test/x4/to_utf8.cpp +++ b/test/x4/to_utf8.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/tst.cpp b/test/x4/tst.cpp index e119c97af..d34e478d6 100644 --- a/test/x4/tst.cpp +++ b/test/x4/tst.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/uint.cpp b/test/x4/uint.cpp index c1dc189bc..d255fad24 100644 --- a/test/x4/uint.cpp +++ b/test/x4/uint.cpp @@ -9,7 +9,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/uint_radix.cpp b/test/x4/uint_radix.cpp index fedb891cf..4831c0612 100644 --- a/test/x4/uint_radix.cpp +++ b/test/x4/uint_radix.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include diff --git a/test/x4/unused.cpp b/test/x4/unused.cpp index 2ee5ef4bb..609d01d9d 100644 --- a/test/x4/unused.cpp +++ b/test/x4/unused.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/with.cpp b/test/x4/with.cpp index 6ec17927e..9b9eb20b0 100644 --- a/test/x4/with.cpp +++ b/test/x4/with.cpp @@ -7,7 +7,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/with_local.cpp b/test/x4/with_local.cpp index c5e5ae2c7..d3f3c9882 100644 --- a/test/x4/with_local.cpp +++ b/test/x4/with_local.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include #include diff --git a/test/x4/x3_rule_problem.cpp b/test/x4/x3_rule_problem.cpp index 9ed42abfd..6a6a8e7c2 100644 --- a/test/x4/x3_rule_problem.cpp +++ b/test/x4/x3_rule_problem.cpp @@ -6,7 +6,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) =============================================================================*/ -#include "test.hpp" +#include "iris_x4_test.hpp" #include