Skip to content

Commit 536e414

Browse files
[CI] Tee Ninja Output to Log Files
This patch makes all of the ninja commands in the monolithic-* scripts write to log files in the current working directory. The plan is to use this to feed the ninja log into generate_test_report_github.py so we can surface compilation errors. Related to llvm#152246. Reviewers: Keenuts, lnihlen, cmtice, dschuff, gburgessiv Reviewed By: Keenuts, cmtice Pull Request: llvm#152331
1 parent 41b5880 commit 536e414

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.ci/monolithic-linux.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
6565
start-group "ninja"
6666

6767
# Targets are not escaped as they are passed as separate arguments.
68-
ninja -C "${BUILD_DIR}" -k 0 ${targets}
68+
ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log
6969

7070
if [[ "${runtime_targets}" != "" ]]; then
7171
start-group "ninja Runtimes"
7272

73-
ninja -C "${BUILD_DIR}" ${runtime_targets}
73+
ninja -C "${BUILD_DIR}" ${runtime_targets} |& tee ninja_runtimes.log
7474
fi
7575

7676
# Compiling runtimes with just-built Clang and running their tests
@@ -85,7 +85,8 @@ if [[ "${runtime_targets_needs_reconfig}" != "" ]]; then
8585

8686
start-group "ninja Runtimes C++26"
8787

88-
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig}
88+
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig} \
89+
|& tee ninja_runtimes_needs_reconfig1.log
8990

9091
start-group "CMake Runtimes Clang Modules"
9192

@@ -96,5 +97,6 @@ if [[ "${runtime_targets_needs_reconfig}" != "" ]]; then
9697

9798
start-group "ninja Runtimes Clang Modules"
9899

99-
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig}
100+
ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig} \
101+
|& tee ninja_runtimes_needs_reconfig2.log
100102
fi

.ci/monolithic-windows.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
5151
start-group "ninja"
5252

5353
# Targets are not escaped as they are passed as separate arguments.
54-
ninja -C "${BUILD_DIR}" -k 0 ${targets}
54+
ninja -C "${BUILD_DIR}" -k 0 ${targets} |& tee ninja.log

0 commit comments

Comments
 (0)