Browse code

Merge "Add $TOP_DIR to the path when calling tools' scripts"

Jenkins authored on 2014/06/18 04:51:27
Showing 1 changed files
... ...
@@ -553,14 +553,14 @@ if [[ -n "$LOGFILE" ]]; then
553 553
     exec 3>&1
554 554
     if [[ "$VERBOSE" == "True" ]]; then
555 555
         # Set fd 1 and 2 to write the log file
556
-        exec 1> >( ./tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1
556
+        exec 1> >( $TOP_DIR/tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1
557 557
         # Set fd 6 to summary log file
558
-        exec 6> >( ./tools/outfilter.py -o "${SUMFILE}" )
558
+        exec 6> >( $TOP_DIR/tools/outfilter.py -o "${SUMFILE}" )
559 559
     else
560 560
         # Set fd 1 and 2 to primary logfile
561
-        exec 1> >( ./tools/outfilter.py -o "${LOGFILE}" ) 2>&1
561
+        exec 1> >( $TOP_DIR/tools/outfilter.py -o "${LOGFILE}" ) 2>&1
562 562
         # Set fd 6 to summary logfile and stdout
563
-        exec 6> >( ./tools/outfilter.py -v -o "${SUMFILE}" >&3 )
563
+        exec 6> >( $TOP_DIR/tools/outfilter.py -v -o "${SUMFILE}" >&3 )
564 564
     fi
565 565
 
566 566
     echo_summary "stack.sh log $LOGFILE"
... ...
@@ -577,7 +577,7 @@ else
577 577
         exec 1>/dev/null 2>&1
578 578
     fi
579 579
     # Always send summary fd to original stdout
580
-    exec 6> >( ./tools/outfilter.py -v >&3 )
580
+    exec 6> >( $TOP_DIR/tools/outfilter.py -v >&3 )
581 581
 fi
582 582
 
583 583
 # Set up logging of screen windows