Fix tests

JuliaGraphics · Sep 16, 2023 · 118f623 · 118f623
1 parent 77c1236
commit 118f623
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,8 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.7'
-          - '1.8'
+          - '1.6'
+          - '1.9'
           - 'nightly'
         os:
           - ubuntu-latest

diff --git a/foreign_thread_manager.cpp b/foreign_thread_manager.cpp
@@ -14,7 +14,14 @@ void ForeignThreadManager::add_thread(QThread *t)
   if(!m_threads.contains(t))
   {
     m_threads.insert(t);
+  #if (JULIA_VERSION_MAJOR * 100 + JULIA_VERSION_MINOR) >= 109
     jl_adopt_thread();
+  #else
+    if(m_threads.size() > 1)
+    {
+      std::cout << "Warning: using multiple threads in Julia versions older than 1.9 will probably crash" << std::endl;
+    }
+  #endif
   }
   m_mutex.unlock();
 }

diff --git a/test/setup-test.jl b/test/setup-test.jl
@@ -24,18 +24,6 @@ function libcxxwrap_jll_version()
   return VersionNumber(baseversion)
 end
 
-@static if Sys.isapple()
-  jllversion = libcxxwrap_jll_version()
-  cd(joinpath(cxxwrap_root, "lib")) do
-    expected_dylib = "libcxxwrap_julia.$jllversion.dylib"
-    if !isfile(expected_dylib)
-      compiled_dylib = readlink("libcxxwrap_julia.dylib")
-      symlink(compiled_dylib, expected_dylib)
-      println("linked $expected_dylib to $compiled_dylib")
-    end
-  end
-end
-
 envdir = mktempdir()
 import Pkg
 Pkg.activate(envdir)