Skip to content

Commit 5372bcd

Browse files
committed
ci: a failed make-based port prints autoconf's config.log
1 parent da44e99 commit 5372bcd

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

‎.github/scripts/check-deps-and-qt.sh‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,8 +474,15 @@ vcpkg_make_port() {
474474
cd "$ROOT/tests/vcpkg-make-port"
475475
rm -rf target
476476
mkdir -p target/ci
477-
"$MCPP" build --toolchain "$MSVC_MANAGED" > target/ci/build.log 2>&1 ||
478-
{ tail -80 target/ci/build.log; fail "the make-based port did not build with the managed toolset"; }
477+
if ! "$MCPP" build --toolchain "$MSVC_MANAGED" > target/ci/build.log 2>&1; then
478+
tail -80 target/ci/build.log
479+
# autoconf records the invocation and the failing test in config.log,
480+
# which vcpkg's own report does not show.
481+
local cfg
482+
cfg=$(find "$(cygpath -u "$LOCALAPPDATA" 2>/dev/null || echo "$HOME")/vcpkg/mcpp" -path '*icu*' -name config.log 2>/dev/null | head -1)
483+
[ -n "$cfg" ] && { echo "--- $cfg"; head -40 "$cfg"; echo "..."; grep -n "invalid variable\|error" "$cfg" | head -20; }
484+
fail "the make-based port did not build with the managed toolset"
485+
fi
479486
"$MCPP" run --toolchain "$MSVC_MANAGED" | tee target/ci/run.log
480487
grep -qE '^vcpkg-make-port: icu [0-9]' target/ci/run.log || fail "the program did not read icu's version"
481488
echo "ok: a make-based port builds with the managed toolset first on the kept PATH"

0 commit comments

Comments
 (0)