diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-01-02T10·31+0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02T10·31+0100 |
commit | 9b67f234c9b6d7496a49dc4d93fd7a51a727d52d (patch) | |
tree | f0c7d7798cbb677a86e3679c3d82def15111f07f /tests | |
parent | 099ba37820653763fa30b7856c85c4b8fed657e0 (diff) | |
parent | 9dd2b8ac7b8d82df8c1f3f36efb683175fd6ecee (diff) |
Merge pull request #1768 from dtzWill/feature/brotli
use libbrotli directly when available
Diffstat (limited to 'tests')
-rw-r--r-- | tests/brotli.sh | 28 | ||||
-rw-r--r-- | tests/common.sh.in | 1 | ||||
-rw-r--r-- | tests/local.mk | 3 |
3 files changed, 31 insertions, 1 deletions
diff --git a/tests/brotli.sh b/tests/brotli.sh new file mode 100644 index 000000000000..645dd4214ec6 --- /dev/null +++ b/tests/brotli.sh @@ -0,0 +1,28 @@ +source common.sh + + +# Only test if we found brotli libraries +# (CLI tool is likely unavailable if libraries are missing) +if [ -n "$HAVE_BROTLI" ]; then + +clearStore +clearCache + +cacheURI="file://$cacheDir?compression=br" + +outPath=$(nix-build dependencies.nix --no-out-link) + +nix copy --to $cacheURI $outPath + +HASH=$(nix hash-path $outPath) + +clearStore +clearCacheCache + +nix copy --from $cacheURI $outPath --no-check-sigs + +HASH2=$(nix hash-path $outPath) + +[[ $HASH = $HASH2 ]] + +fi # HAVE_BROTLI diff --git a/tests/common.sh.in b/tests/common.sh.in index 09f2949141a4..83643d8b06bb 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -32,6 +32,7 @@ export xmllint="@xmllint@" export SHELL="@bash@" export PAGER=cat export HAVE_SODIUM="@HAVE_SODIUM@" +export HAVE_BROTLI="@HAVE_BROTLI@" export version=@PACKAGE_VERSION@ export system=@system@ diff --git a/tests/local.mk b/tests/local.mk index baf74224bb12..83154228e999 100644 --- a/tests/local.mk +++ b/tests/local.mk @@ -19,7 +19,8 @@ nix_tests = \ fetchGit.sh \ fetchMercurial.sh \ signing.sh \ - run.sh + run.sh \ + brotli.sh # parallel.sh install-tests += $(foreach x, $(nix_tests), tests/$(x)) |