From 57d4e5db7700d6dc4e2b05c5dbeffb842f57e413 Mon Sep 17 00:00:00 2001 From: metagn Date: Thu, 3 Oct 2024 17:13:30 +0300 Subject: [PATCH] test linking to /opt/homebrew/lib instead --- testament/important_packages.nim | 4 +--- tests/closure/tboehmdeepcopy.nims | 2 ++ tests/cpp/temitlist.nim | 1 - tests/cpp/tempty_generic_obj.nim | 1 - tests/cpp/tmanual_exception.nim | 2 -- tests/cpp/tmanual_exception.nims | 2 ++ tests/dll/config.nims | 2 ++ tests/gc/config.nims | 2 ++ 8 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 tests/closure/tboehmdeepcopy.nims create mode 100644 tests/cpp/tmanual_exception.nims create mode 100644 tests/dll/config.nims create mode 100644 tests/gc/config.nims diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 2d1554b1cafb..ca0f4dc841cc 100644 --- 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 new file mode 100644 index 000000000000..46ce53392b6d --- /dev/null +++ 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 index c4d6ed9e794b..01549e978c26 100644 --- 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 index f1e273cc54b3..c42f08dcdd4a 100644 --- 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 index a91ccffe4cb2..190e7719d605 100644 --- 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 new file mode 100644 index 000000000000..46ce53392b6d --- /dev/null +++ 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 new file mode 100644 index 000000000000..46ce53392b6d --- /dev/null +++ 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 new file mode 100644 index 000000000000..46ce53392b6d --- /dev/null +++ b/tests/gc/config.nims @@ -0,0 +1,2 @@ +when defined(osx): + switch("clibdir", "/opt/homebrew/lib")