fixed several PC solaris PATH problems - build problems
authorsonja.mirtitsch%sun.com
Tue, 20 Nov 2001 01:06:41 +0000
changeset 2355 5f551262f91725c3ce42610bfe9bc8759137091d
parent 2352 4f5f8296dad62aa1fb4f30b55e87f74985dbaa87 (current diff)
parent 2354 2d1e2b255259eb9f1c08e3a76d344a6ccafb9984 (diff)
child 2356 f5d724c825354c0dcd75c54709e8a5a5a5e51d82
push idunknown
push userunknown
push dateunknown
fixed several PC solaris PATH problems - build problems
security/nss/tests/nssqa
security/nss/tests/set_environment
--- a/security/nss/tests/nssqa
+++ b/security/nss/tests/nssqa
@@ -130,17 +130,19 @@ wait_for_build()
 #     the build ; needed to detemine if the build finished, passed and for
 #     the directory names
 ########################################################################
 map_os32()
 {
     case `uname -s` in
         SunOS)
             S_REL=`uname -r | sed -e "s/^[^\.]*\.//g"`
-            if [ "$S_REL" -lt 8 ] ; then
+            if [ `uname -p` = "i386" ] ; then
+                MAPPED_OS=Solaris8_x86
+            elif [ "$S_REL" -lt 8 ] ; then
                 MAPPED_OS=Solaris2.6
             else
                 MAPPED_OS=Solaris8_forte6
             fi
             ;;
         OSF1)
             MAPPED_OS=OSF1V4.0
             ;;
@@ -242,18 +244,17 @@ nssqa_main()
       run_all
   else
       Debug "This is a 32 bit platform"
   fi
 }
   
 TEST_LEVEL=0
 
-while [ $TEST_LEVEL -lt 2 ] ; do # temporarily disable backward 
-                                 # compatibility testing
+while [ $TEST_LEVEL -lt 2 ] ; do 
     export TEST_LEVEL
     unset BUILD_OPT;export BUILD_OPT;Debug "BUILD_OPT $BUILD_OPT"
     unset USE_64;export USE_64;Debug "USE_64 $USE_64"
     bc $TEST_LEVEL
     Debug "About to start nssqa_main"
     if [ $O_FILE = ON -a "$O_WIN" != "ON" ] ; then
         nssqa_main 2>>$FILENAME
     else
--- a/security/nss/tests/set_environment
+++ b/security/nss/tests/set_environment
@@ -34,16 +34,17 @@ then
     PATH=.:$HOME/bin:/tools/ns/bin:/bin:/usr/bin:/usr/sbin:/usr/ccs/bin:/usr/dist/local/exe:/usr/bin/X11:/usr/audio/bin:/u/sonmi/bin:$PATH
     JAVA_HOME="D:/i386/jdk1.2.2"
 fi
 
 CVSROOT=:pserver:svbld@redcvs.red.iplanet.com:/m/src
 
 os_name=`uname -s`
 os_version=`uname -r`
+os_p=`uname -p`
 os_full=""
 
 if [ -f /u/svbld/bin/nsarch  ]
 then
     os_full=`/u/svbld/bin/nsarch -f`    #FIXME
 fi
 
 MANPATH=/usr/share/man:/usr/openwin/man:/usr/local/man
@@ -54,39 +55,42 @@ AFTER_CONTEXT_GREP=""
 
 export CVSROOT HOME os_name os_version os_full MANPATH
 
 
 if [ "$os_name" = "HP-UX" ]
 then
     PATH=$PATH:/usr/local/bin:/opt/aCC/bin:/usr/local/bin/audio:/tools/ns/bin:/etc:/usr/contrib/bin:/usr/contrib/bin/X11:/usr/local/hpux/bin:/nfs/iapp1/hphome/bin:/etc:/u/svbld/bin/HP/perl/bin
     JAVA_HOME="/share/builds/components/cms_jdk/HP-UX/1.2.2.04"
+#    JAVA_HOME="/share/builds/components/cms_jdk/HP-UX/1.3.0.00"
 elif [ "$os_name" = "SunOS" ]
 then
     NATIVE_FLAG="-native"
     XAPPLRESDIR=/usr/openwin/lib/app-defaults:/usr/local/lib/X11/app-defaults
     OPENWINHOME=/usr/openwin
     LD_LIBRARY_PATH=$OPENWINHOME/lib
-    PATH=/tools/ns/bin:$PATH:/opt/SUNWspro/bin:/usr/bin/X11:/usr/openwin/bin:/usr/openwin/demo
-    if [ "$os_version" = "5.8" -o "$os_version" = "5.7" -o \
-         "$os_version" = "5.9" ]
-    then
-        PATH=$PATH:/tools/ns/workshop-5.0/bin
-    else
-        PATH=$PATH:/tools/ns/workshop-4.0/bin
-    fi
-    PATH=$PATH:/usr/ccs/bin:/usr/ucb/bin:/opt/SUNWwabi/bin:/usr/local/bin:/tools/ns/bin:/etc:/tools/contrib/bin
     if [ "$os_full" = "SOLARISx86 2.8" -o "$os_full" = "SOLARISx86 2.9" ] 
     then
-        PATH=/usr/ucb:/opt/usr/local/bin:$PATH
+        #PATH=/usr/ucb:/opt/usr/local/bin:$PATH
         JAVA_HOME="/usr/java1.2"
+        PATH=".:/usr/dist/share/forte_dev_i386,v6.2/SUNWspro/bin:/opt/usr/local/perl5/bin:/opt/SUNWspro/bin:/opt/usr/local/bin:/bin:/usr/bin:/usr/sbin:/usr/ccs/bin:/usr/dist/local/exe:/usr/ccs/bin:/usr/ucb/bin:/usr/ucb:/opt/SUNWwabi/bin:/usr/local/bin:/tools/ns/bin:/etc:/tools/contrib/bin"
     else
         PATH=/usr/ucb:$PATH
         JAVA_HOME="/share/builds/components/jdk/1.2.2/SunOS"
-    fi
+        PATH=/tools/ns/bin:$PATH:/opt/SUNWspro/bin:/usr/bin/X11:/usr/openwin/bin:/usr/openwin/demo
+    
+        if [ "$os_version" = "5.8" -o "$os_version" = "5.7" -o \
+             "$os_version" = "5.9" ]
+        then
+            PATH=$PATH:/usr/dist/pkgs/forte_dev,v6.2/SUNWspro/bin:/tools/ns/workshop/bin
+        else
+            PATH=$PATH:/usr/dist/share/devpro,v5.0/5.x-sparc/bin:/tools/ns/workshop/bin
+        fi
+        PATH=$PATH:/usr/ccs/bin:/usr/ucb/bin:/opt/SUNWwabi/bin:/usr/local/bin:/tools/ns/bin:/etc:/tools/contrib/bin
+     fi
     export XAPPLRESDIR  OPENWINHOME LD_LIBRARY_PATH
 
 elif [ "$os_name" = "IRIX" ]
 then
     PATH=$PATH:/tools/ns/bin:/usr/local/bin:/etc:/usr/bsd
     MANPATH=/tools/ns/man:/usr/local/man
     JAVA_HOME="/share/builds/components/jdk/1.2.2/IRIX"
 elif [ "$os_name" = "IRIX64" ]
@@ -209,10 +213,11 @@ BASEPATH=$PATH    # in  case we we set a
 export PATH EDITOR EMACSLOADPATH PYTHONPATH PAGER XMCD_LIBDIR DISPLAY MANPATH os_full os_name BASEPATH RSH O_WIN
 
 umask 022
 
 system=`uname -n`        # name of this system.
 
 JAVAC=$JAVA_HOME/bin/javac
 JAVA=$JAVA_HOME/bin/java
+#JAVA=$JAVA_HOME/jre/bin/java
 export JAVAC JAVA JAVA_HOME