From 97b83480865904050c7b0ebf77b6632c80379c43 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Sun, 5 Feb 2023 10:52:57 +0000 Subject: [PATCH] Kokoro: Fix windows builds The change to use `go run` over `go build` has upset the windows kokoro builds. Use absolute paths. Change-Id: Id9700529b3460a5ab579f82f616a95c3498c152c Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/118722 Kokoro: Kokoro Auto-Submit: Ben Clayton Commit-Queue: James Price Reviewed-by: James Price --- infra/kokoro/windows/build.bat | 2 +- tools/run | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/kokoro/windows/build.bat b/infra/kokoro/windows/build.bat index 0de7b53622..e3b2670087 100644 --- a/infra/kokoro/windows/build.bat +++ b/infra/kokoro/windows/build.bat @@ -156,7 +156,7 @@ cd /d %SRC_DIR% || goto :error rem Run tests with DXC, FXC and Metal validation set OLD_PATH=%PATH% set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH% -call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose || goto :error +call git bash -- ./test/tint/test-all.sh %BUILD_DIR%/tint.exe --verbose || goto :error set PATH=%OLD_PATH% @echo off diff --git a/tools/run b/tools/run index ffcb9d89d2..b70540c2a9 100755 --- a/tools/run +++ b/tools/run @@ -45,6 +45,6 @@ if [ ! -d "${SCRIPT_DIR}/src/cmd/${TOOL}" ]; then show_usage fi -pushd "${SCRIPT_DIR}/src" > /dev/null - go run "./cmd/${TOOL}" "${@:2}" +pushd "${SCRIPT_DIR}/.." > /dev/null + go run "${SCRIPT_DIR}/src/cmd/${TOOL}" "${@:2}" popd > /dev/null