fix test issues with Linux and Windows

Author: dietmarkuehl

tests/beman/execution/exec-spawn-future.test.cpp

@@ -49,14 +49,14 @@ struct throws {
 };
 static_assert(!std::is_nothrow_constructible_v<std::decay_t<throws>, throws>);
 
-template <bool Expect, typename Sender, typename Token, typename Env = ::env>
-auto test_spawn_future_interface(Sender&& sndr, Token&& tok, Env&& e = Env{}) -> void {
+template <bool Expect, typename Env = ::env, typename Sender, typename Token>
+auto test_spawn_future_interface(Sender&& sndr, Token&& tok) -> void {
     if constexpr (!std::same_as<std::remove_cvref_t<Env>, non_env>) {
         static_assert(Expect ==
                       requires { test_std::spawn_future(std::forward<Sender>(sndr), std::forward<Token>(tok)); });
     }
-    static_assert(Expect == requires {
-        test_std::spawn_future(std::forward<Sender>(sndr), std::forward<Token>(tok), std::forward<Env>(e));
+    static_assert(Expect == requires(Env const& e){
+        test_std::spawn_future(std::forward<Sender>(sndr), std::forward<Token>(tok), e);
     });
 }
 
@@ -189,7 +189,8 @@ TEST(exec_spawn_future) {
     test_spawn_future_interface<true>(sender{}, token<true>{});
     test_spawn_future_interface<false>(non_sender{}, token<true>{});
     test_spawn_future_interface<false>(sender{}, token<false>{});
-    test_spawn_future_interface<false>(sender{}, token<true>{}, *new non_env{});
+
+    test_spawn_future_interface<false, non_env>(sender{}, token<true>{});
 
     test_state_base();
     test_receiver();

tests/beman/execution/include/test/execution.hpp

@@ -10,9 +10,10 @@
 #ifndef _MSC_VER
 #include <cstdlib>
 #include <unistd.h>
+#include <sys/wait.h>
 #include <iostream>
-#include <source_location>
 #endif
+#include <source_location>
 
 #undef NDEBUG
 #include <cassert>
@@ -27,6 +28,16 @@ namespace test_std    = ::beman::execution;
 namespace test_detail = ::beman::execution::detail;
 
 namespace test {
+#if 201907L <= __cpp_lib_source_location
+using source_location = ::std::source_location;
+#else
+struct source_location {
+    static auto current() -> source_location { return {}; }
+    auto file_name() const -> char const* { return "<unknown:no std::source_location>"; }
+    auto line() const -> char const* { return "<unknown:no std::source_location>"; }
+};
+#endif
+
 inline bool unreachable_helper() { return false; }
 
 template <typename>
@@ -48,7 +59,7 @@ struct throws {
 };
 
 inline auto death([[maybe_unused]] auto                   fun,
-                  [[maybe_unused]] ::std::source_location location = std::source_location::current()) noexcept
+                  [[maybe_unused]] ::std::source_location location = test::source_location::current()) noexcept
     -> void {
 #ifndef _MSC_VER
     switch (::pid_t rc = ::fork()) {