Skip to content

Commit eee568f

Browse files
committed
ci: the test kit builds with the managed toolset on the row without Visual Studio
1 parent 006cec1 commit eee568f

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,10 @@ plugin_logic() {
369369
cd "$ROOT/tests/plugin-logic"
370370
rm -rf target
371371
mkdir -p target/ci
372-
"$MCPP" build > target/ci/build.log 2>&1 || { cat target/ci/build.log; fail "a plugin-logic case failed"; }
372+
# On the row without Visual Studio the build program itself needs the
373+
# managed toolset, which that job names in MSVC_MANAGED.
374+
"$MCPP" build ${MSVC_MANAGED:+--toolchain "$MSVC_MANAGED"} > target/ci/build.log 2>&1 ||
375+
{ cat target/ci/build.log; fail "a plugin-logic case failed"; }
373376
local results declared passed
374377
results=$(find target -path '*plugins-testing/results.txt' | head -1)
375378
[ -n "$results" ] || fail "the kit wrote no results.txt"

0 commit comments

Comments
 (0)