summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-05-24 11:39:36 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-05-24 11:39:48 -0500
commitb1236ac54444d1d7afcdae92b12a840ba46664e1 (patch)
tree3a2ed9965e44e4d29d8a862d1e19115bd3df8f5f
parent8d8b2166e6912f66b8d4a4281fd1c69d0d18c244 (diff)
build.pl restore the output 'interactivity'
-rwxr-xr-xsolenv/bin/build.pl19
1 files changed, 10 insertions, 9 deletions
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 344d00a8bdf7..2ee9af468e92 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2021,15 +2021,16 @@ sub run_job {
if (!-d $log_dir) {
system("$perl $mkout");
};
- $error_code = system ("$job_to_do > $log_file 2>&1");
- if ( -f $log_file) {
- open(LOGFILE, "< $log_file");
- print while(<LOGFILE>);
- close(LOGFILE);
- if ( $error_code != 0)
- {
- system("cat $log_file >> $build_error_log");
- }
+ open (MAKE, "$job_to_do 2>&1 |") or return 8;
+ open (LOGFILE, "> $log_file") or return 8;
+ while (<MAKE>) { print LOGFILE $_; print $_ }
+ close MAKE;
+ $error_code = $?;
+ close LOGFILE;
+ if ( $error_code != 0)
+ {
+ system("echo \"log for $path\" >> $build_error_log");
+ system("cat $log_file >> $build_error_log");
}
return $error_code;