fixed one more tinderbox NT problem

security/nss/tests/header

@@ -253,6 +253,16 @@ set_d2()
 tbx_dirs()
 {
     Debug "Set directories for tinderbox"
+    if [ "$O_WIN" = "ON" ] ; then
+        win_set_d1 #also gets the TMP straight and we need the D1 later
+    else
+        D1=/h/hs-sca15c/export/builds/mccrel/nss/nss$NSSVER
+    fi
+    if [ -z "${RESULTDIR}" ] ; then # needs to be different for tinderbox
+        Debug "Setting RESULTDIR for tinderbox"
+        RESULTDIR="${D1}/tinderbox/tests_results/security/${HOST}-`date +%Y%m%d-%H:%M`"
+        #RESULTDIR=${UX_MASTERDIR}/mozilla/tests_results/security
+    fi
     TBX_D2=`cd ../../../../..;pwd`
     D1="${TBX_D2}/../.." 
     set_d2
@@ -263,11 +273,6 @@ tbx_dirs()
     UXDIST=${MOZILLA_ROOT}/dist
     NTDIST=${UXDIST}
 
-    if [ -z "${RESULTDIR}" ] ; then #FIXME, needs to be different for tinderbox
-        Debug "Setting RESULTDIR for tinderbox"
-        RESULTDIR="/h/hs-sca15c/export/builds/mccrel/nss/nsstip/tinderbox/tests_results/security/${HOST}-`date +%Y%m%d-%H:%M`"
-        #RESULTDIR=${UX_MASTERDIR}/mozilla/tests_results/security
-    fi
     if [ -z "${TESTDIR}" ] ; then 
         Debug "Setting TESTDIR for tinderbox"
         TESTDIR=${RESULTDIR}