about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-10T10·54+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-10T10·54+0100
commit1c972cba145dc95cb0930a83caf191f1ef722f8b (patch)
treeed57b226f29a2963bd6ff46cd1919c4e5c23a063 /tests
parent5d9cd27dce30e1f221815f3f888203414e12a167 (diff)
Make libsodium an optional dependency
Diffstat (limited to 'tests')
-rw-r--r--tests/binary-cache.sh4
-rw-r--r--tests/common.sh.in1
2 files changed, 5 insertions, 0 deletions
diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index b0e7f63ae0b6..753c2c466e6d 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -89,6 +89,8 @@ nix-build --option binary-caches "file://$cacheDir" dependencies.nix -o $TEST_RO
 grep -q "Downloading" $TEST_ROOT/log
 
 
+if [ -n "$HAVE_SODIUM" ]; then
+
 # Create a signed binary cache.
 clearCache
 
@@ -137,3 +139,5 @@ done
 rm -f $NIX_STATE_DIR/binary-cache*
 
 (! nix-store -r $outPath --option binary-caches "file://$cacheDir" --option signed-binary-caches '*' --option binary-cache-public-keys "$publicKey")
+
+fi # HAVE_LIBSODIUM
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 8c265d1a8de0..eb9798a27b45 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -25,6 +25,7 @@ export dot=@dot@
 export xmllint="@xmllint@"
 export SHELL="@bash@"
 export PAGER=cat
+export HAVE_SODIUM="@HAVE_SODIUM@"
 
 export version=@PACKAGE_VERSION@
 export system=@system@