Build tests using modules...

...when both FLUX_BUILD_TESTS and FLUX_BUILD_MODULE CMake options are set. This is a big change set, but it mostly consists of reordering things so that all #includes come before `import flux`. In some cases we were testing (or using) things in the `detail` namespace, which are now no longer exported; these are currently just ifdef'd out.
tcbrindle · Jan 6, 2024 · bf38e00 · bf38e00
1 parent 8323ebe
commit bf38e00
Show file tree

Hide file tree

Showing 70 changed files with 180 additions and 236 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -93,6 +93,19 @@ if(${FLUX_ENABLE_UBSAN})
     target_link_options(test-libflux PRIVATE -fsanitize=undefined)
 endif()
 
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0")
+    if (${FLUX_BUILD_MODULE})
+        target_sources(test-libflux PUBLIC
+            FILE_SET CXX_MODULES
+            BASE_DIRS ${PROJECT_SOURCE_DIR}/module
+            FILES ${PROJECT_SOURCE_DIR}/module/flux.cpp
+        )
+
+        target_compile_definitions(test-libflux PRIVATE -DUSE_MODULES)
+        set_target_properties(test-libflux PROPERTIES CXX_SCAN_FOR_MODULES On)
+    endif()
+endif()
+
 if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
     target_precompile_headers(test-libflux PRIVATE "catch.hpp")
 endif()

diff --git a/test/test_adjacent.cpp b/test/test_adjacent.cpp
@@ -5,12 +5,15 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
+#ifndef USE_MODULES
+#include <flux.hpp>
+#else
+import flux;
+#endif
 
 namespace {
 

diff --git a/test/test_adjacent_filter.cpp b/test/test_adjacent_filter.cpp
@@ -5,12 +5,10 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
 namespace {
 
 constexpr bool test_adjacent_filter()

diff --git a/test/test_adjacent_map.cpp b/test/test_adjacent_map.cpp
@@ -5,12 +5,10 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
 namespace {
 
 constexpr bool test_pairwise_map() {

diff --git a/test/test_all_any_none.cpp b/test/test_all_any_none.cpp
@@ -5,7 +5,11 @@
 
 #include "catch.hpp"
 
+#ifdef USE_MODULES
+import flux;
+#else
 #include <flux/op/all_any_none.hpp>
+#endif
 
 namespace {
 

diff --git a/test/test_apply.cpp b/test/test_apply.cpp
@@ -1,8 +1,6 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
 #include <array>
 #include <algorithm>
 

diff --git a/test/test_array_ptr.cpp b/test/test_array_ptr.cpp
@@ -5,14 +5,12 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <algorithm>
 #include <numeric>
 
+#include "test_utils.hpp"
+
 namespace {
 
 struct Base {

diff --git a/test/test_bitset.cpp b/test/test_bitset.cpp
@@ -5,14 +5,11 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-#include <flux/source/bitset.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <iostream>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_bitset()

diff --git a/test/test_bounds_checked.cpp b/test/test_bounds_checked.cpp
@@ -5,8 +5,6 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
 #include <vector>
 
 #include "test_utils.hpp"

diff --git a/test/test_cache_last.cpp b/test/test_cache_last.cpp
@@ -1,8 +1,6 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
 #include <array>
 
 #include "test_utils.hpp"

diff --git a/test/test_cartesian_product.cpp b/test/test_cartesian_product.cpp
@@ -7,13 +7,6 @@
 
 #include "catch.hpp"
 
-#include <flux/op/cartesian_product.hpp>
-#include <flux/op/reverse.hpp>
-#include <flux/source/iota.hpp>
-#include <flux/source/empty.hpp>
-#include <flux/source/iota.hpp>
-#include <flux/op/for_each.hpp>
-
 #include <array>
 #include <iostream>
 #include <string_view>

diff --git a/test/test_cartesian_product_with.cpp b/test/test_cartesian_product_with.cpp
@@ -1,8 +1,6 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
 #include <array>
 
 #include "test_utils.hpp"

diff --git a/test/test_chain.cpp b/test/test_chain.cpp
@@ -5,15 +5,12 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-#include <flux/op/write_to.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <iostream>
 #include <vector>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_chain()

diff --git a/test/test_chunk.cpp b/test/test_chunk.cpp
@@ -5,15 +5,13 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <limits>
 #include <list>
 #include <sstream>
 
+#include "test_utils.hpp"
+
 namespace {
 
 #ifdef _MSC_VER
@@ -33,8 +31,24 @@ struct NotBidir : flux::inline_sequence_base<NotBidir<Base>> {
     constexpr Base& base() & { return base_; }
     constexpr Base const& base() const& { return base_; }
 
-    struct flux_sequence_traits : flux::detail::passthrough_traits_base<Base> {
-        static void dec(...) = delete;
+    struct flux_sequence_traits {
+        static constexpr auto first(auto& self) { return flux::first(self.base_); }
+
+        static constexpr bool is_last(auto& self, auto const& cur) {
+            return flux::is_last(self.base_, cur);
+        }
+
+        static constexpr void inc(auto& self, auto& cur) {
+            flux::inc(self.base_, cur);
+        }
+
+        static constexpr decltype(auto) read_at(auto& self, auto const& cur) {
+            return flux::read_at(self.base_, cur);
+        }
+
+        static constexpr auto last(auto& self) { return flux::last(self.base_); }
+
+        static constexpr auto size(auto& self) { return flux::size(self.base_); }
     };
 };
 

diff --git a/test/test_chunk_by.cpp b/test/test_chunk_by.cpp
@@ -16,13 +16,11 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <iostream>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_chunk_by() {

diff --git a/test/test_compare.cpp b/test/test_compare.cpp
@@ -5,12 +5,10 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
 namespace {
 
 struct Test {
@@ -77,7 +75,9 @@ constexpr bool test_compare()
     // empty sequences are equal
     {
         // ...but still require the element types to be comparable
-        static_assert(not std::invocable<flux::detail::compare_fn, flux::detail::empty_sequence<int>, flux::detail::empty_sequence<std::nullptr_t>>);
+        static_assert(not std::invocable<decltype(flux::compare),
+                                         decltype(flux::empty<int>),
+                                         decltype(flux::empty<std::nullptr_t>)>);
 
         auto r = flux::compare(flux::empty<int>, flux::empty<int>);
         static_assert(std::same_as<decltype(r), std::strong_ordering>);

diff --git a/test/test_concepts.cpp b/test/test_concepts.cpp
@@ -5,7 +5,11 @@
 
 #include "catch.hpp"
 
+#ifdef USE_MODULES
+import flux;
+#else
 #include <flux.hpp>
+#endif
 
 namespace {
 

diff --git a/test/test_contains.cpp b/test/test_contains.cpp
@@ -5,12 +5,10 @@
 
 #include "catch.hpp"
 
-#include <flux/op/contains.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
 namespace {
 
 struct Test {

diff --git a/test/test_count.cpp b/test/test_count.cpp
@@ -5,12 +5,8 @@
 
 #include "catch.hpp"
 
-#include <flux/op/count.hpp>
-#include <flux/op/take_while.hpp>
-
 #include "test_utils.hpp"
 
-
 namespace {
 
 struct S {

diff --git a/test/test_count_if.cpp b/test/test_count_if.cpp
@@ -5,9 +5,6 @@
 
 #include "catch.hpp"
 
-#include <flux/op/count.hpp>
-#include <flux/op/take_while.hpp>
-
 #include "test_utils.hpp"
 
 

diff --git a/test/test_cursors.cpp b/test/test_cursors.cpp
@@ -5,13 +5,11 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <sstream>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_cursors()

diff --git a/test/test_cycle.cpp b/test/test_cycle.cpp
@@ -5,13 +5,11 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <limits>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_cycle() {

diff --git a/test/test_drop.cpp b/test/test_drop.cpp
@@ -5,17 +5,15 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
-
-#include "test_utils.hpp"
-
 #include <array>
 #include <list>
 #include <span>
 #include <string>
 #include <string_view>
 #include <vector>
 
+#include "test_utils.hpp"
+
 namespace {
 
 constexpr bool test_drop() {

diff --git a/test/test_drop_while.cpp b/test/test_drop_while.cpp
@@ -5,12 +5,10 @@
 
 #include "catch.hpp"
 
-#include <flux.hpp>
+#include <array>
 
 #include "test_utils.hpp"
 
-#include <array>
-
 namespace {
 
 constexpr bool test_drop_while()

diff --git a/test/test_empty.cpp b/test/test_empty.cpp
@@ -5,7 +5,11 @@
 
 #include "catch.hpp"
 
+#ifdef USE_MODULES
+import flux;
+#else
 #include <flux/source/empty.hpp>
+#endif
 
 namespace {