Browse code

Merge "Add $TOP_DIR to the path when calling tools' scripts" into stable/havana

Jenkins authored on 2014/06/20 09:30:02
Showing 1 changed files
... ...
@@ -498,14 +498,14 @@ if [[ -n "$LOGFILE" ]]; then
498 498
     exec 3>&1
499 499
     if [[ "$VERBOSE" == "True" ]]; then
500 500
         # Set fd 1 and 2 to write the log file
501
-        exec 1> >( ./tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1
501
+        exec 1> >( $TOP_DIR/tools/outfilter.py -v -o "${LOGFILE}" ) 2>&1
502 502
         # Set fd 6 to summary log file
503
-        exec 6> >( ./tools/outfilter.py -o "${SUMFILE}" )
503
+        exec 6> >( $TOP_DIR/tools/outfilter.py -o "${SUMFILE}" )
504 504
     else
505 505
         # Set fd 1 and 2 to primary logfile
506
-        exec 1> >( ./tools/outfilter.py -o "${LOGFILE}" ) 2>&1
506
+        exec 1> >( $TOP_DIR/tools/outfilter.py -o "${LOGFILE}" ) 2>&1
507 507
         # Set fd 6 to summary logfile and stdout
508
-        exec 6> >( ./tools/outfilter.py -v -o "${SUMFILE}" >&3 )
508
+        exec 6> >( $TOP_DIR/tools/outfilter.py -v -o "${SUMFILE}" >&3 )
509 509
     fi
510 510
 
511 511
     echo_summary "stack.sh log $LOGFILE"
... ...
@@ -521,7 +521,7 @@ else
521 521
         exec 1>/dev/null 2>&1
522 522
     fi
523 523
     # Always send summary fd to original stdout
524
-    exec 6> >( ./tools/outfilter.py -v >&3 )
524
+    exec 6> >( $TOP_DIR/tools/outfilter.py -v >&3 )
525 525
 fi
526 526
 
527 527
 # Set up logging of screen windows