Making tests more portable

gershnik · Aug 8, 2024 · 167731d · 167731d
1 parent daadbd1
commit 167731d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 58 deletions.
diff --git a/test/BlockUtilTestCpp.cpp b/test/BlockUtilTestCpp.cpp
@@ -2,6 +2,8 @@
 
 #include "doctest.h"
 
+#include <string>
+
 TEST_SUITE_BEGIN( "BlockUtilTestsCpp" );
 
 namespace {

diff --git a/test/CoDispatchTests.mm b/test/CoDispatchTests.mm
@@ -698,27 +698,14 @@ static auto checkIO() -> DispatchTask<> {
     co_await resumeOnMainQueue();
 }
 
-static DispatchTask<> runTests(bool & shouldKeepRunning) {
-
-    co_await checkReturnPropagation();
-    co_await checkDispatchToDifferentQueue();
-    co_await checkMakeAwaitable();
-    co_await checkTasks();
-    co_await checkGenerator();
-    co_await checkIO();
-
-    shouldKeepRunning = false;
-}
-
-
 TEST_CASE("CoDispatchTests") {
-
-    bool shouldKeepRunning = true;
-
-    runTests(shouldKeepRunning);
-
-    NSRunLoop * theRL = [NSRunLoop currentRunLoop];
-    while (shouldKeepRunning && [theRL runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]]);
-
+    []() -> DispatchTask<> {
+        co_await checkReturnPropagation();
+        co_await checkDispatchToDifferentQueue();
+        co_await checkMakeAwaitable();
+        co_await checkTasks();
+        co_await checkGenerator();
+        co_await checkIO();
+    }();
 }
 
diff --git a/test/CoDispatchTestsCpp.cpp b/test/CoDispatchTestsCpp.cpp
@@ -2,21 +2,31 @@
 
 #include "doctest.h"
 
-#include <CoreFoundation/CoreFoundation.h>
+#if (defined(__APPLE__) && defined(__MACH__))
 #include <mach-o/dyld.h>
+#endif
 
 #include <filesystem>
+#include <vector>
 
 static auto checkIO() -> DispatchTask<> {
 
-    auto conq = dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0);
+    auto conq = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0);
 
     co_await resumeOn(conq);
 
+#if (defined(__APPLE__) && defined(__MACH__))
     char buf[1024];
     uint32_t size = sizeof(buf);
     REQUIRE(_NSGetExecutablePath(buf, &size) == 0);
     std::filesystem::path path(buf);
+#else
+    std::filesystem::path selfLink = "/proc/" + std::to_string(getpid()) + "/exe";
+    std::error_code ec;
+    std::filesystem::path path = read_symlink(selfLink, ec);
+    REQUIRE(!ec);
+#endif
+
     path = path.parent_path() / "test.txt";
 
     dispatch_data_t hello = dispatch_data_create("hello", 5, conq,  DISPATCH_DATA_DESTRUCTOR_DEFAULT);
@@ -99,9 +109,9 @@ static auto checkIO() -> DispatchTask<> {
     co_await resumeOnMainQueue();
 }
 
-static DispatchTask<> runTests(bool & shouldKeepRunning) {
+static DispatchTask<> runTests() {
 
-    auto conq = dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0);
+    auto conq = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0);
 
     int i = co_await co_dispatch([&]() {
         return 7;
@@ -139,20 +149,9 @@ static DispatchTask<> runTests(bool & shouldKeepRunning) {
     }
 
     co_await checkIO();
-
-    shouldKeepRunning = false;
-
 }
 
 TEST_CASE("CoDispatchTestsCpp") {
-
-    bool shouldKeepRunning = true;
-
-    runTests(shouldKeepRunning);
-
-    while (shouldKeepRunning) {
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, std::numeric_limits<CFTimeInterval>::max(), true);
-    }
-
+    runTests();
 }
 
diff --git a/test/CoDispatchTestsNoexcept.cpp b/test/CoDispatchTestsNoexcept.cpp
@@ -2,28 +2,14 @@
 
 #include "doctest.h"
 
-#include <CoreFoundation/CoreFoundation.h>
-
-
-static DispatchTask<> runTests(bool & shouldKeepRunning) {
-
-    auto i = co_await co_dispatch([]() {
-        return 7;
-    });
-    CHECK(i == 7);
-
-    shouldKeepRunning = false;
-}
 
 
 TEST_CASE("CoDispatchTestsNoExcept") {
 
-    bool shouldKeepRunning = true;
-
-    runTests(shouldKeepRunning);
-
-    while (shouldKeepRunning) {
-        CFRunLoopRunInMode(kCFRunLoopDefaultMode, std::numeric_limits<CFTimeInterval>::max(), true);
-    }
-
+    []() -> DispatchTask<> {
+        auto i = co_await co_dispatch([]() {
+            return 7;
+        });
+        CHECK(i == 7);
+    }();
 }
diff --git a/test/main.mm b/test/main.mm
@@ -2,8 +2,16 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include "doctest.h"
 
+#include <dispatch/dispatch.h>
+
 int main(int argc, const char * argv[]) {
     @autoreleasepool {
-        return doctest::Context(argc, argv).run();
+        dispatch_async(dispatch_get_main_queue(), ^ {
+            @autoreleasepool {
+                auto ret = doctest::Context(argc, argv).run();
+                exit(ret);
+            }
+        });
+        dispatch_main();
     }
 }