diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-13T17·49-0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-13T17·49-0500 |
| commit | 3fe9767dd33499c2560d209dc13a01f5fcead1f0 (patch) | |
| tree | 606f60879cc5831f2d2ea248b73dc9b86481d4c4 | |
| parent | 52c777a79318c85c8fbd8c02174a03511de278db (diff) | |
Fix plugin tests on darwin
| -rw-r--r-- | tests/local.mk | 2 | ||||
| -rw-r--r-- | tests/plugins.sh | 2 | ||||
| -rw-r--r-- | tests/plugins/local.mk | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/local.mk b/tests/local.mk index 51bc09dd4322..2a4832e1304e 100644 --- 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 index 23caf04f3380..0fad4f773a28 100644 --- 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 index a5f19b087c82..1d2bac052fd2 100644 --- 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 |