diff options
| author | Elio Maldonado <emaldona@redhat.com> | 2014-06-17 17:23:54 -0700 |
|---|---|---|
| committer | Elio Maldonado <emaldona@redhat.com> | 2014-06-17 17:23:54 -0700 |
| commit | a0033b2749a86d1337177026fff19a93d2635b14 (patch) | |
| tree | 8083c76c0fb2216fa049ba5ff6541175375e108b | |
| parent | 2c2b6ce7434c7af24295f5f0d6cd20077f145827 (diff) | |
| download | nss-hg-a0033b2749a86d1337177026fff19a93d2635b14.tar.gz | |
Bug 902171 - Support choosing the appropriate subset of the cipher suite to run according to the type of build, r=wtc
| -rwxr-xr-x | tests/cipher/cipher.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/cipher/cipher.sh b/tests/cipher/cipher.sh index a24af82cf..12e78e185 100755 --- a/tests/cipher/cipher.sh +++ b/tests/cipher/cipher.sh @@ -129,6 +129,12 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${PROG_SUFFIX} ]; then return 0 fi cipher_init -cipher_main -cipher_gcm +# Skip cipher_main if this an NSS without softoken build. +if [ "${NSS_BUILD_WITHOUT_SOFTOKEN}" != "1" ]; then + cipher_main +fi +# Skip cipher_gcm if this is a softoken only build. +if [ "${NSS_BUILD_SOFTOKEN_ONLY}" != "1" ]; then + cipher_gcm +fi cipher_cleanup |