test linking to /opt/homebrew/lib instead

nim-lang · Oct 3, 2024 · 57d4e5d · 57d4e5d
1 parent 6460ffe
commit 57d4e5d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/testament/important_packages.nim b/testament/important_packages.nim
@@ -109,9 +109,7 @@ pkg "netty"
 pkg "nico", allowFailure = true
 pkg "nicy", "nim c -r src/nicy.nim"
 when defined(osx):
-  # gives "could not load: libgtk-3.0.dylib" on macos 13
-  # just test compiling instead of running
-  pkg "nigui", "nim c -o:niguii src/nigui.nim"
+  pkg "nigui", "nim c --clibdir:/opt/homebrew/lib -o:niguii -r src/nigui.nim"
 else:
   pkg "nigui", "nim c -o:niguii -r src/nigui.nim"
 pkg "nimcrypto", "nim r --path:. tests/testall.nim" # `--path:.` workaround needed, see D20210308T165435

diff --git a/tests/closure/tboehmdeepcopy.nims b/tests/closure/tboehmdeepcopy.nims
@@ -0,0 +1,2 @@
+when defined(osx):
+  switch("clibdir", "/opt/homebrew/lib")
diff --git a/tests/cpp/temitlist.nim b/tests/cpp/temitlist.nim
@@ -3,7 +3,6 @@ discard """
   output: '''
 6.0
 0'''
-#disabled: "windows" # pending bug #18011
 """
 
 # bug #4730

diff --git a/tests/cpp/tempty_generic_obj.nim b/tests/cpp/tempty_generic_obj.nim
@@ -3,7 +3,6 @@ discard """
   output: '''
 int
 float'''
-#disabled: "windows" # pending bug #18011
 """
 
 import typetraits

diff --git a/tests/cpp/tmanual_exception.nim b/tests/cpp/tmanual_exception.nim
@@ -1,6 +1,4 @@
 discard """
-  # doesn't work on macos 13 seemingly due to libc++ linking issue https://stackoverflow.com/a/77375947
-  disabled: osx
   targets: cpp
 """
 

diff --git a/tests/cpp/tmanual_exception.nims b/tests/cpp/tmanual_exception.nims
@@ -0,0 +1,2 @@
+when defined(osx):
+  switch("clibdir", "/opt/homebrew/lib")
diff --git a/tests/dll/config.nims b/tests/dll/config.nims
@@ -0,0 +1,2 @@
+when defined(osx):
+  switch("clibdir", "/opt/homebrew/lib")
diff --git a/tests/gc/config.nims b/tests/gc/config.nims
@@ -0,0 +1,2 @@
+when defined(osx):
+  switch("clibdir", "/opt/homebrew/lib")