about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-02-08T18·00-0500
committerShea Levy <shea@shealevy.com>2018-02-08T19·35-0500
commit081f14a169d36243f97263acb41fb108af243619 (patch)
tree563a1287be33bff5b2d36d38a9e77338425d45b4 /tests
parent88cd2d41acb994684a3e4ead1b1676019f43b4b6 (diff)
Allow using RegisterPrimop to define constants.
This enables plugins to add new constants, as well as new primops.
Diffstat (limited to 'tests')
-rw-r--r--tests/plugins.sh2
-rw-r--r--tests/plugins/plugintest.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/plugins.sh b/tests/plugins.sh
index 6d18d1da0d18..23caf04f3380 100644
--- a/tests/plugins.sh
+++ b/tests/plugins.sh
@@ -2,6 +2,6 @@ source common.sh
 
 set -o pipefail
 
-res=$(nix eval '(builtins.constNull true)' --option plugin-files $PWD/plugins/plugintest.so)
+res=$(nix eval '(builtins.anotherNull)' --option plugin-files $PWD/plugins/plugintest.so)
 
 [ "$res"x = "nullx" ]
diff --git a/tests/plugins/plugintest.cc b/tests/plugins/plugintest.cc
index f788c4814322..6b5e6d7cde21 100644
--- a/tests/plugins/plugintest.cc
+++ b/tests/plugins/plugintest.cc
@@ -2,9 +2,9 @@
 
 using namespace nix;
 
-static void prim_constNull (EvalState & state, const Pos & pos, Value ** args, Value & v)
+static void prim_anotherNull (EvalState & state, const Pos & pos, Value ** args, Value & v)
 {
     mkNull(v);
 }
 
-static RegisterPrimOp r("constNull", 1, prim_constNull);
+static RegisterPrimOp r("anotherNull", 0, prim_anotherNull);