Bug 1825620 - pt8 - change all 'tee -a' to 'tee --append' in loop-ff.sh r=ng DONTBUILD

Differential Revision: https://phabricator.services.mozilla.com/D175824
This commit is contained in:
Michael Froman 2023-04-20 03:26:29 +00:00
Родитель bfdb970bc5
Коммит 53beecc267
1 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -7,7 +7,7 @@ LOOP_OUTPUT_LOG=$LOG_DIR/log-loop-ff.txt
function echo_log()
{
echo "===loop-ff=== $@" 2>&1| tee -a $LOOP_OUTPUT_LOG
echo "===loop-ff=== $@" 2>&1| tee --append $LOOP_OUTPUT_LOG
}
function show_error_msg()
@ -122,7 +122,8 @@ When fixed, please resume this script with the following command:
"
if [ "x$SKIP_NEXT_REVERT_CHK" == "x0" ]; then
echo_log "Check for upcoming revert commit"
AUTO_FIX_REVERT_AS_NOOP=1 bash $SCRIPT_DIR/detect_upstream_revert.sh 2>&1| tee -a $LOOP_OUTPUT_LOG
AUTO_FIX_REVERT_AS_NOOP=1 bash $SCRIPT_DIR/detect_upstream_revert.sh \
2>&1| tee --append $LOOP_OUTPUT_LOG
fi
SKIP_NEXT_REVERT_CHK="0"
ERROR_HELP=""
@ -134,7 +135,7 @@ if [ -f $STATE_DIR/$MOZ_LIBWEBRTC_NEXT_BASE.no-op-cherry-pick-msg ]; then
fi
echo_log "Moving from moz-libwebrtc commit $MOZ_LIBWEBRTC_BASE to $MOZ_LIBWEBRTC_NEXT_BASE"
bash $SCRIPT_DIR/fast-forward-libwebrtc.sh 2>&1| tee -a $LOOP_OUTPUT_LOG
bash $SCRIPT_DIR/fast-forward-libwebrtc.sh 2>&1| tee --append $LOOP_OUTPUT_LOG
MOZ_CHANGED=`hg diff -c tip --stat \
| egrep -ve "README.moz-ff-commit|README.mozilla|files changed," \
@ -173,8 +174,8 @@ HANDLE_NOOP_COMMIT=""
--branch $MOZ_LIBWEBRTC_BRANCH \
--patch-path "third_party/libwebrtc/moz-patch-stack" \
--state-path $STATE_DIR \
--target-branch-head $MOZ_TARGET_UPSTREAM_BRANCH_HEAD
2>&1| tee -a $LOOP_OUTPUT_LOG
--target-branch-head $MOZ_TARGET_UPSTREAM_BRANCH_HEAD \
2>&1| tee --append $LOOP_OUTPUT_LOG
MODIFIED_BUILD_RELATED_FILE_CNT=`hg diff -c tip --stat \
--include 'third_party/libwebrtc/**BUILD.gn' \
@ -199,7 +200,7 @@ echo_log "Modified BUILD.gn (or webrtc.gni) files: $MODIFIED_BUILD_RELATED_FILE_
if [ "x$MODIFIED_BUILD_RELATED_FILE_CNT" != "x0" ]; then
echo_log "Regenerate build files"
./mach python python/mozbuild/mozbuild/gn_processor.py \
$SCRIPT_DIR/gn-configs/webrtc.json 2>&1| tee -a $LOOP_OUTPUT_LOG
$SCRIPT_DIR/gn-configs/webrtc.json 2>&1| tee --append $LOOP_OUTPUT_LOG
MOZ_BUILD_CHANGE_CNT=`hg status third_party/libwebrtc \
--include 'third_party/libwebrtc/**moz.build' | wc -l | tr -d " "`
@ -207,7 +208,7 @@ if [ "x$MODIFIED_BUILD_RELATED_FILE_CNT" != "x0" ]; then
echo_log "Detected modified moz.build files, commiting"
fi
bash $SCRIPT_DIR/commit-build-file-changes.sh 2>&1| tee -a $LOOP_OUTPUT_LOG
bash $SCRIPT_DIR/commit-build-file-changes.sh 2>&1| tee --append $LOOP_OUTPUT_LOG
fi
ERROR_HELP=""
@ -216,7 +217,7 @@ The test build has failed. Most likely this is due to an upstream api change th
must be reflected in Mozilla code outside of the third_party/libwebrtc directory.
"
echo_log "Test build"
./mach build 2>&1| tee -a $LOOP_OUTPUT_LOG
./mach build 2>&1| tee --append $LOOP_OUTPUT_LOG
ERROR_HELP=""
if [ ! "x$MOZ_STOP_AFTER_COMMIT" = "x" ]; then