From 3fe9767dd33499c2560d209dc13a01f5fcead1f0 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 13 Feb 2018 12:49:14 -0500
Subject: Fix plugin tests on darwin

---
 tests/local.mk         |  2 +-
 tests/plugins.sh       |  2 +-
 tests/plugins/local.mk | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/local.mk b/tests/local.mk
index 51bc09dd4..2a4832e13 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 23caf04f3..0fad4f773 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 a5f19b087..1d2bac052 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
-- 
cgit v1.2.3