lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

Fix plugin tests on darwin

Browse source
This commit is contained in:
Shea Levy 2018-02-13 12:49:14 -05:00
parent 52c777a793
commit 3fe9767dd3
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/local.mk
View file

@ -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)

2
tests/plugins.sh
View file

@ -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" ]

10
tests/plugins/local.mk
View file

@ -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