diff options
-rw-r--r-- | coreconf/Linux.mk | 2 | ||||
-rw-r--r-- | coreconf/ruleset.mk | 6 | ||||
-rw-r--r-- | manifest.mn | 4 | ||||
-rwxr-xr-x | tests/all.sh | 1 | ||||
-rwxr-xr-x | tests/cert/cert.sh | 31 | ||||
-rw-r--r-- | tests/common/init.sh | 2 | ||||
-rwxr-xr-x | tests/dbupgrade/dbupgrade.sh | 2 |
7 files changed, 3 insertions, 45 deletions
diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk index 177a3c874..6567f25fd 100644 --- a/coreconf/Linux.mk +++ b/coreconf/Linux.mk @@ -42,7 +42,7 @@ ifndef INTERNAL_TOOLS CROSS_COMPILE = 1 endif endif -ifeq (,$(filter-out ppc64 ppc64le,$(OS_TEST))) +ifeq ($(OS_TEST),ppc64) CPU_ARCH = ppc ifeq ($(USE_64),1) ARCHFLAG = -m64 diff --git a/coreconf/ruleset.mk b/coreconf/ruleset.mk index 74d64e1fb..14762378b 100644 --- a/coreconf/ruleset.mk +++ b/coreconf/ruleset.mk @@ -112,15 +112,11 @@ ifndef TARGETS TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) endif -# Make both .cpp and .cc work. -CPPSRCS1 = $(CPPSRCS:.cpp=$(OBJ_SUFFIX)) -CPPSRCS2 = $(CPPSRCS1:.cc=$(OBJ_SUFFIX)) - ifndef OBJS SIMPLE_OBJS = $(JRI_STUB_CFILES) \ $(addsuffix $(OBJ_SUFFIX), $(JMC_GEN)) \ $(CSRCS:.c=$(OBJ_SUFFIX)) \ - $(CPPSRCS2) \ + $(CPPSRCS:.cpp=$(OBJ_SUFFIX)) \ $(ASFILES:$(ASM_SUFFIX)=$(OBJ_SUFFIX)) \ $(BUILT_CSRCS:.c=$(OBJ_SUFFIX)) \ $(BUILT_CPPSRCS:.cpp=$(OBJ_SUFFIX)) \ diff --git a/manifest.mn b/manifest.mn index bcc60171f..666a2b997 100644 --- a/manifest.mn +++ b/manifest.mn @@ -11,7 +11,3 @@ IMPORTS = nspr20/v4.8 \ RELEASE = nss DIRS = coreconf lib cmd - -ifdef NSS_BUILD_GTESTS -DIRS += gtests -endif diff --git a/tests/all.sh b/tests/all.sh index 42ee54b3a..c0d2ba918 100755 --- a/tests/all.sh +++ b/tests/all.sh @@ -35,7 +35,6 @@ # dbupgrade.sh - upgrade databases to new shareable version (used # only in upgrade test cycle) # memleak.sh - memory leak testing (optional) -# ssl_gtests.sh- Gtest based unit tests for ssl (optional) # # NSS testing is now devided to 4 cycles: # --------------------------------------- diff --git a/tests/cert/cert.sh b/tests/cert/cert.sh index 9f424ff5c..1a23c19c4 100755 --- a/tests/cert/cert.sh +++ b/tests/cert/cert.sh @@ -945,36 +945,6 @@ cert_ssl() pk12u -o ${R_STAPLINGDIR}/ca.p12 -n TestCA -k ${R_PWFILE} -w ${R_PWFILE} -d ${R_CADIR} pk12u -i ${R_STAPLINGDIR}/ca.p12 -k ${R_PWFILE} -w ${R_PWFILE} -d ${R_STAPLINGDIR} } - -############################# ssl_gtest ########################## -# local shell function to create serve certs for SSL gtests -################################################################## -cert_ssl_gtests() -{ - CERTFAILED=0 - echo "$SCRIPTNAME: Creating ssl_gtest DB dir" - cert_init_cert ${SSLGTESTDIR} "server" 1 ${D_EXT_SERVER} - echo "$SCRIPTNAME: Creating database for ssl_gtests" - certu -N -d "${SSLGTESTDIR}" --empty-password 2>&1 - # the ssl server used here is special: is a self-signed server - # certificate with name server. - echo "$SCRIPTNAME: Creating server cert for ssl_gtests" - certu -S -z ${R_NOISE_FILE} -g 2048 -d ${SSLGTESTDIR} -n server -s "CN=server" -t C,C,C -x -m 1 -w -2 -v 120 -Z SHA256 -1 -2 <<CERTSCRIPT -0 -2 -9 -n -n - -n -CERTSCRIPT - - if [ "$RET" -ne 0 ]; then - echo "return value is $RET" - Exit 6 "Fatal - failed to create server cert for ssl_gtests" - fi -} - ############################## cert_stresscerts ################################ # local shell function to create client certs for SSL stresstest ######################################################################## @@ -1732,7 +1702,6 @@ cert_init cert_all_CA cert_extended_ssl cert_ssl -cert_ssl_gtests cert_smime_client if [ -z "$NSS_TEST_DISABLE_FIPS" ]; then cert_fips diff --git a/tests/common/init.sh b/tests/common/init.sh index 2afc57294..b3d44b034 100644 --- a/tests/common/init.sh +++ b/tests/common/init.sh @@ -76,7 +76,6 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then CERT_EXTENSIONS_DIR=${HOSTDIR}/cert_extensions STAPLINGDIR=${HOSTDIR}/stapling - SSLGTESTDIR=${HOSTDIR}/ssl_gtests PWFILE=${HOSTDIR}/tests.pw NOISE_FILE=${HOSTDIR}/tests_noise @@ -539,7 +538,6 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then R_EXT_CLIENTDIR=../ext_client R_CERT_EXT=../cert_extensions R_STAPLINGDIR=../stapling - R_SSLGTESTDIR=../ssl_gtests # # profiles are either paths or domains depending on the setting of diff --git a/tests/dbupgrade/dbupgrade.sh b/tests/dbupgrade/dbupgrade.sh index 9d25f1f04..b43ac14fc 100755 --- a/tests/dbupgrade/dbupgrade.sh +++ b/tests/dbupgrade/dbupgrade.sh @@ -63,7 +63,7 @@ dbupgrade_main() # test upgrade to the new database echo "nss" > ${PWFILE} html_head "Legacy to shared Library update" - dirs="alicedir bobdir CA cert_extensions client clientCA dave eccurves eve ext_client ext_server SDR server serverCA ssl_gtests stapling tools/copydir" + dirs="alicedir bobdir CA cert_extensions client clientCA dave eccurves eve ext_client ext_server SDR server serverCA stapling tools/copydir" for i in $dirs do echo $i |