diff options
author | cvs2hg <devnull@localhost> | 2001-07-02 23:41:08 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2001-07-02 23:41:08 +0000 |
commit | 99196665c2e1077da9804ad3cb692621b4dcb20d (patch) | |
tree | bf6a131d10d98a0edae0dcbd492da373382c1713 /security/nss/tests/set_environment | |
parent | 50fbf2ed9c277623fc1014197175409bfbf9933a (diff) | |
download | nss-hg-99196665c2e1077da9804ad3cb692621b4dcb20d.tar.gz |
fixup commit for branch 'FONT_20011307_BRANCH'
Diffstat (limited to 'security/nss/tests/set_environment')
-rw-r--r-- | security/nss/tests/set_environment | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/security/nss/tests/set_environment b/security/nss/tests/set_environment index 13dedabc4..7489668e5 100644 --- a/security/nss/tests/set_environment +++ b/security/nss/tests/set_environment @@ -20,10 +20,6 @@ then QASCRIPT_DIR=`dirname $0` fi - -#FIXME - where do we need the OLDPATH - -OLDPATH="$PATH" 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 CVSROOT=:pserver:svbld@cvsserver:/m/src @@ -119,20 +115,18 @@ then os_name="Windows" O_CYGNUS=ON O_WIN=ON - OLDPATH=`echo "$OLDPATH" | sed -e 's/\\\/\//g'` PATH="`dirname $0`:.:/cygdrive/c/cygwin/bin:/cygdrive/z/nstools/bin:/cygdrive/z/nstools/perl5:/cygdrive/z/bin:/cygdrive/c/WINNT/System32:/cygdrive/c/WINNT" -#:$OLDPATH: RM=/cygdrive/c/cygwin/bin/rm.exe #FIXME - in case we cant cporrect #these with the PATH alone PATH=`perl $QASCRIPT_DIR/path_uniq "$PATH"` + RSH=/cygdrive/c/winnt/system32/rsh elif [ "$os_name" = "Windows_95" -o \ "$os_name" = "Windows_NT" -o \ "$os_name" = "WINNT" -o \ + "$os_name" = "Windows" -o \ "$os_name" = "Windows_98" ] then #FIXME net use, mount the neccessary pnetwork drives and partitiones first - #OLDPATH=`echo "$OLDPATH" | sed -e 's/\\\/\//g'` FIXME - MKS shell - # interprets \bin as <backspace>in... PATH=`echo $SHELL | sed -e "s/.ksh.exe//g" -e "s/.sh.exe//g"` PATH="Z:/nstools/bin;Z:/nstools/perl5;z:/bin;$PATH" @@ -149,6 +143,7 @@ then os_name="Windows" O_MKS=ON O_WIN=ON + RSH=c:/winnt/system32/rsh else EDITOR=vi @@ -158,6 +153,7 @@ else XMCD_LIBDIR=/usr/local/lib/xmcd DISPLAY=:0.0 PATH=`perl $QASCRIPT_DIR/path_uniq "$PATH"` + RSH=rsh fi BASEPATH=$PATH # in case we we set and reset DIST directories the PATH |