Fix plugin tests on darwin

NixOS · Feb 13, 2018 · 3fe9767 · 3fe9767 · copumpkin · Feb 13, 2018
1 parent 52c777a
commit 3fe9767
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/tests/local.mk b/tests/local.mk
@@ -32,4 +32,4 @@ tests-environment = NIX_REMOTE= $(bash) -e
 
 clean-files += $(d)/common.sh
 
-installcheck: $(d)/common.sh $(d)/plugins/plugintest.so
+installcheck: $(d)/common.sh $(d)/plugins/libplugintest.$(SO_EXT)
diff --git a/tests/plugins.sh b/tests/plugins.sh
@@ -2,6 +2,6 @@ source common.sh
 
 set -o pipefail
 
-res=$(nix eval '(builtins.anotherNull)' --option plugin-files $PWD/plugins/plugintest.so)
+res=$(nix eval '(builtins.anotherNull)' --option plugin-files $PWD/plugins/libplugintest*)
 
 [ "$res"x = "nullx" ]
diff --git a/tests/plugins/local.mk b/tests/plugins/local.mk
@@ -1,9 +1,9 @@
-libraries += plugintest
+libraries += libplugintest
 
-plugintest_DIR := $(d)
+libplugintest_DIR := $(d)
 
-plugintest_SOURCES := $(d)/plugintest.cc
+libplugintest_SOURCES := $(d)/plugintest.cc
 
-plugintest_ALLOW_UNDEFINED := 1
+libplugintest_ALLOW_UNDEFINED := 1
 
-plugintest_EXCLUDE_FROM_LIBRARY_LIST := 1
+libplugintest_EXCLUDE_FROM_LIBRARY_LIST := 1