From ae1eb3376b86f7f4916918032e865463b2236a63 Mon Sep 17 00:00:00 2001
From: "sonja.mirtitsch%sun.com" <sonja.mirtitsch%sun.com>
Date: Mon, 3 Dec 2001 23:00:02 +0000
Subject: [PATCH] commiting some changes (backwardcompatibility tests, uname -p
 problem, numbers of tests...) before starting to work on tinderbox problem,
 log hard to find. 111229

---
 security/nss/tests/header          | 26 +++++++++++++++++---------
 security/nss/tests/set_environment |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/security/nss/tests/header b/security/nss/tests/header
index 40548085edbb..a1c048ddcabf 100644
--- a/security/nss/tests/header
+++ b/security/nss/tests/header
@@ -15,7 +15,7 @@
 #
 # parameters
 # ----------
-#   nssversion (supported: 30b, 31, tip 32)
+#   nssversion (supported: 30b, 31, 332, tip 32)
 #   builddate (default - today)
 #
 # options
@@ -181,10 +181,18 @@ fi
                           # NOTE: following variables have to change 
                           # from release to release
 if [ -z "$BC_MASTER" ]    # master directory for backwardscompatibility testing
-then                      # a linux compiler bug prevents us from doing the 
-                          # testing against a rtm - so we rebuild the branch
-    BC_UX_MASTER=nss322/builds/20010820.1/y2sun2_Solaris8
-    BC_NT_MASTER=nss322/builds/20010820.1/blowfish_NT4.0_Win95
+then
+    RH="NO"
+    grep 7.1 /etc/redhat-release > /dev/null 2>/dev/null && RH="YES"
+
+    if [ "$RH" = "YES" ] 
+    then                      # NSS-3-3-1RTM
+        BC_UX_MASTER=nss331/builds/20010928.2.331-RTM/booboo_Solaris8
+        BC_NT_MASTER=nss331/builds/20010928.2.331-RTM/blowfish_NT4.0_Win95
+    else                      # NSS-3-2-2RTM
+        BC_UX_MASTER=nss322/builds/20010820.1/y2sun2_Solaris8
+        BC_NT_MASTER=nss322/builds/20010820.1/blowfish_NT4.0_Win95
+    fi
     BC_MASTER=$BC_UX_MASTER
 fi
 BC_RELEASE=3.2
@@ -839,8 +847,8 @@ eval_opts()
             NSSVER=$1
             if [ -z "$NSSVER" ]        
             then
-                NSSVER="tip"
-                Debug "NSS Version: Parameters missing - defaulting to tip!"
+                NSSVER="332"
+                Debug "NSS Version: Parameters missing - defaulting to 332!"
             else
                 BUILDDATE=$2
                 if [ -z "$BUILDDATE" ] 
@@ -867,8 +875,8 @@ eval_opts()
   fi
   if [ -z "$NSSVER" ]            
   then
-      NSSVER="tip"
-      Debug "NSS Version: Parameters missing - defaulting to tip!"
+      NSSVER="332"
+      Debug "NSS Version: Parameters missing - defaulting to 332!"
   fi
   
   Debug "Builddate $BUILDDATE NssVersion $NSSVER"
diff --git a/security/nss/tests/set_environment b/security/nss/tests/set_environment
index a1a8a8596127..829d6c6d9a36 100644
--- a/security/nss/tests/set_environment
+++ b/security/nss/tests/set_environment
@@ -39,7 +39,7 @@ CVSROOT=:pserver:svbld@redcvs.red.iplanet.com:/m/src
 
 os_name=`uname -s`
 os_version=`uname -r`
-os_p=`uname -p`
+#os_p=`uname -p`
 os_full=""
 
 if [ -f /u/svbld/bin/nsarch  ]