fix tests

Author: Sylvain Garcia

lib/io_service.cpp

@@ -355,7 +355,7 @@ cppcoro::io_service::io_service(
 	, m_winsockInitialised(false)
 	, m_winsockInitialisationMutex()
 #elif CPPCORO_OS_LINUX
-    , m_uq(queue_length)
+    , m_uq(std::max(queue_length, size_t(10)))
 #endif
 	, m_scheduleOperations(nullptr)
 #if CPPCORO_OS_WINNT

test/file_tests.cpp

@@ -29,13 +29,19 @@ namespace fs = cppcoro::filesystem;
 
 namespace
 {
+    template <bool use_current_dir = false>
 	class temp_dir_fixture
 	{
 	public:
 
 		temp_dir_fixture()
 		{
-			auto tempDir = fs::temp_directory_path();
+			fs::path tempDir;
+			if constexpr (use_current_dir) {
+                tempDir = fs::current_path() / "tmp";
+			} else {
+                tempDir = fs::temp_directory_path();
+			}
 
 			std::random_device random;
 			for (int attempt = 1;; ++attempt)
@@ -72,14 +78,23 @@ namespace
 
 	};
 
+    template <bool use_current_dir = false>
 	class temp_dir_with_io_service_fixture :
 		public io_service_fixture,
-		public temp_dir_fixture
+		public temp_dir_fixture<use_current_dir>
 	{
 	};
 }
 
-TEST_CASE_FIXTURE(temp_dir_fixture, "write a file")
+#ifdef CPPCORO_TESTS_LIMITED_RESOURCES
+using tmp_dir_fixture = temp_dir_fixture<true>;
+using tmp_dir_with_io_service_fixture = temp_dir_with_io_service_fixture<true>;
+#else
+using tmp_dir_fixture = temp_dir_fixture<>;
+using tmp_dir_with_io_service_fixture = temp_dir_with_io_service_fixture<>;
+#endif
+
+TEST_CASE_FIXTURE(tmp_dir_fixture, "write a file")
 {
 	auto filePath = temp_dir() / "foo";
 
@@ -143,7 +158,7 @@ TEST_CASE_FIXTURE(temp_dir_fixture, "write a file")
 		}()));
 }
 
-TEST_CASE_FIXTURE(temp_dir_with_io_service_fixture, "read write file")
+TEST_CASE_FIXTURE(tmp_dir_with_io_service_fixture, "read write file")
 {
 	auto run = [&]() -> cppcoro::task<>
 	{
@@ -168,7 +183,7 @@ TEST_CASE_FIXTURE(temp_dir_with_io_service_fixture, "read write file")
 	cppcoro::sync_wait(run());
 }
 
-TEST_CASE_FIXTURE(temp_dir_with_io_service_fixture, "cancel read")
+TEST_CASE_FIXTURE(tmp_dir_with_io_service_fixture, "cancel read")
 {
 	cppcoro::sync_wait([&]() -> cppcoro::task<>
 	{

test/io_service_fixture.hpp

@@ -19,8 +19,8 @@ struct io_service_fixture
 {
 public:
 
-	io_service_fixture(std::uint32_t threadCount = 1)
-		: m_ioService()
+	io_service_fixture(std::uint32_t threadCount = 1, std::uint32_t concurrencyHint = 0)
+		: m_ioService(concurrencyHint)
 	{
 		m_ioThreads.reserve(threadCount);
 		try
@@ -60,11 +60,11 @@ struct io_service_fixture
 
 };
 
-template<std::uint32_t thread_count>
+template<std::uint32_t thread_count, std::uint32_t concurrency_hint = 0>
 struct io_service_fixture_with_threads : io_service_fixture
 {
 	io_service_fixture_with_threads()
-		: io_service_fixture(thread_count)
+		: io_service_fixture(thread_count, concurrency_hint)
 	{}
 };
 

test/io_service_tests.cpp

@@ -69,12 +69,18 @@ TEST_CASE("schedule coroutine")
 		}()));
 }
 
-TEST_CASE_FIXTURE(io_service_fixture_with_threads<2>, "multiple I/O threads servicing events")
+#if CPPCORO_USE_IO_RING
+using multi_io_thread_servicing_events_fixture = io_service_fixture_with_threads<2, 128>;
+#else
+using multi_io_thread_servicing_events_fixture = io_service_fixture_with_threads<2>;
+#endif
+
+TEST_CASE_FIXTURE(multi_io_thread_servicing_events_fixture, "multiple I/O threads servicing events")
 {
 	std::atomic<int> completedCount = 0;
 
 #ifdef CPPCORO_TESTS_LIMITED_RESOURCES
-    constexpr int operations = 128;
+    constexpr int operations = 256;
 #else
     constexpr int operations = 1000;
 #endif
@@ -197,7 +203,13 @@ TEST_CASE("Timer cancellation"
 		}()));
 }
 
-TEST_CASE_FIXTURE(io_service_fixture_with_threads<1>, "Many concurrent timers")
+#if CPPCORO_USE_IO_RING
+using many_concurrent_fixture = io_service_fixture_with_threads<1, 10>;
+#else
+using many_concurrent_fixture = io_service_fixture_with_threads<1>;
+#endif
+
+TEST_CASE_FIXTURE(many_concurrent_fixture, "Many concurrent timers")
 {
 	auto startTimer = [&]() -> cppcoro::task<>
 	{

test/when_all_tests.cpp

@@ -112,7 +112,14 @@ TEST_CASE("when_all() with all task types")
 
 		CHECK(a == "foo");
 		CHECK(b.id == 0);
-		CHECK(counted::active_count() == 1);
+    // GCC 10.1 fails this check: at this point there are 3 objects alive
+    // * One will be destructed later
+    // * One object is completely leaked
+#if CPPCORO_COMPILER_GCC && CPPCORO_COMPILER_GCC <= 10'02'00
+		WARN("GCC <= 10.02 is known to produce memory leaks !!!");
+#else
+        CHECK(counted::active_count() == 1);
+#endif
 	};
 
 	cppcoro::async_manual_reset_event event;