X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Flmake;h=cb177a287dfbbecdf3c8750c60db59545488827a;hb=cfaf31a01d1e3023611130ec1f8ece073f0092b9;hp=1b58e4e7a80d77581cb13a8111baa37496efcae8;hpb=977186c95de375dafce014011ec638560483a246;p=fs%2Flustre-release.git diff --git a/build/lmake b/build/lmake index 1b58e4e..cb177a2 100755 --- a/build/lmake +++ b/build/lmake @@ -382,7 +382,10 @@ depend_kernel() # new items conservatively. QA will get notified on anything newly added # for them to review and adjust accordingly. local logfile=$(mktemp /tmp/XXXXXX) - timed_run 300 $TOPDIR/build/update_oldconfig $logfile + #timed_run 300 $TOPDIR/build/update_oldconfig $logfile + #local RC=${PIPESTATUS[0]} + #local RC=$(strace -f -o update_oldconfig.strace bash -c "$TOPDIR/build/update_oldconfig $logfile; echo \$?") + $TOPDIR/build/update_oldconfig $logfile local RC=${PIPESTATUS[0]} if [ $RC -eq 143 ]; then fatal 1 "update_oldconfig timed out" @@ -390,6 +393,10 @@ depend_kernel() # dump the log cat $logfile rm -f $logfile + if [ -f update_oldconfig.strace ]; then + cat update_oldconfig.strace + rm -f update_oldconfig.strace + fi fatal 1 "update_oldconfig failed: $RC. See log above." fi rm -f $logfile