diff options
| author | rrelyea%redhat.com <devnull@localhost> | 2008-03-12 20:44:01 +0000 |
|---|---|---|
| committer | rrelyea%redhat.com <devnull@localhost> | 2008-03-12 20:44:01 +0000 |
| commit | 91857a8353fbc06a8e2660786e28e1044c138408 (patch) | |
| tree | b031ba9b6332ad1846dba2264d6b8ddf659fb324 | |
| parent | 91e9c3e7d412dfb0bf91f743eddcf31fd9c36c8b (diff) | |
| download | nss-hg-91857a8353fbc06a8e2660786e28e1044c138408.tar.gz | |
Turn off merge code util we can fix the test case
| -rwxr-xr-x | security/nss/tests/all.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh index 384c68bf1..0c589b569 100755 --- a/security/nss/tests/all.sh +++ b/security/nss/tests/all.sh @@ -97,7 +97,7 @@ run_tests() done } -tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge" +tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp" if [ -z "$BUILD_LIBPKIX_TESTS" ] ; then tests=`echo "${tests}" | sed -e "s/libpkix//"` fi |