Move kokoro dir under infra
Relabel a bunch of things as Dawn instead of Tint. Also adjust the tools/lint to only lint Tint. - It doesn't like Dawn code much. Bug: dawn:1339 Change-Id: Iab224cfbea2314f9e06fe71f8d75d825bc483c43 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86066 Reviewed-by: Antonio Maiorano <amaiorano@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton
Dawn LUCI CQ
parent
feb42e5231
commit
17393c1535
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
set -e # Fail on any error.
|
||||
|
||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/../.." >/dev/null 2>&1 && pwd )"
|
||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/../../.." >/dev/null 2>&1 && pwd )"
|
||||
|
||||
# Inside the docker VM, we clone the project to a new directory.
|
||||
# We do this so that the docker script can be tested in a local development
|
||||
|
|
@ -35,11 +35,11 @@ fi
|
|||
docker run --rm -i \
|
||||
--privileged \
|
||||
--volume "${ROOT_DIR}:${ROOT_DIR}" \
|
||||
--volume "${TMP_DIR}/kokoro/tint:/tint" \
|
||||
--volume "${TMP_DIR}/kokoro/dawn:/dawn" \
|
||||
--volume "${KOKORO_ARTIFACTS_DIR}:/mnt/artifacts" \
|
||||
--workdir "${ROOT_DIR}" \
|
||||
--env SRC_DIR="/tint/src" \
|
||||
--env BUILD_DIR="/tint/build" \
|
||||
--env SRC_DIR="/dawn/src" \
|
||||
--env BUILD_DIR="/dawn/build" \
|
||||
--env BUILD_TYPE=$BUILD_TYPE \
|
||||
--env BUILD_SYSTEM=$BUILD_SYSTEM \
|
||||
--env BUILD_SANITIZER=$BUILD_SANITIZER \
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug-asan/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug-ubsan/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-debug/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-release-asan/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-release-ubsan/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-clang-release/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-gcc-debug/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/linux/cmake-gcc-release/build.sh"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Copyright 2021 The Tint Authors.
|
||||
# Copyright 2021 The Tint and Dawn Authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -15,16 +15,16 @@
|
|||
# limitations under the License.
|
||||
|
||||
# This is the bash script invoked inside a docker container.
|
||||
# The script expects that the CWD points to a clean checkout of Tint.
|
||||
# As `gclient sync` will litter the tint checkout with fetched tools and
|
||||
# projects, this script will first clone the pristine tint checkout to
|
||||
# The script expects that the CWD points to a clean checkout of Dawn.
|
||||
# As `gclient sync` will litter the dawn checkout with fetched tools and
|
||||
# projects, this script will first clone the pristine dawn checkout to
|
||||
# ${SRC_DIR}. This allows developers to locally run this script without having
|
||||
# to worry about their local tint copy being touched.
|
||||
# to worry about their local dawn copy being touched.
|
||||
#
|
||||
# This script expects the following environment variables to be set on entry:
|
||||
#
|
||||
# SRC_DIR - Path to where the local Tint copy will be made. See above.
|
||||
# BUILD_DIR - Path to where Tint will be built.
|
||||
# SRC_DIR - Path to where the local Dawn copy will be made. See above.
|
||||
# BUILD_DIR - Path to where Dawn will be built.
|
||||
# BUILD_TYPE - Either: 'Debug' or 'Release'
|
||||
# BUILD_SYSTEM - Must be 'cmake'
|
||||
# BUILD_SANITIZER - Either: '', 'asan', or 'ubstan'
|
||||
|
|
@ -132,7 +132,7 @@ if [ "$BUILD_SYSTEM" == "cmake" ]; then
|
|||
cmake --build . --target tint-docs
|
||||
hide_cmds
|
||||
|
||||
status "Building tint in '${BUILD_DIR}'"
|
||||
status "Building dawn in '${BUILD_DIR}'"
|
||||
show_cmds
|
||||
cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS}
|
||||
cmake --build . -- --jobs=$(nproc)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
@rem Copyright 2021 The Tint Authors.
|
||||
@rem Copyright 2021 The Tint and Dawn Authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
|
|
@ -42,10 +42,10 @@ exit /b 0
|
|||
|
||||
:main
|
||||
|
||||
set ORIGINAL_SRC_DIR= %~dp0\..\..
|
||||
set TEMP_DIR=%TEMP%\tint-temp
|
||||
set SRC_DIR="%TEMP_DIR%\tint-src"
|
||||
set BUILD_DIR="%TEMP_DIR%\tint-build"
|
||||
set ORIGINAL_SRC_DIR= %~dp0\..\..\..
|
||||
set TEMP_DIR=%TEMP%\dawn-temp
|
||||
set SRC_DIR="%TEMP_DIR%\dawn-src"
|
||||
set BUILD_DIR="%TEMP_DIR%\dawn-build"
|
||||
|
||||
cd /d %ORIGINAL_SRC_DIR%
|
||||
if not exist ".git\" (
|
||||
|
|
@ -119,7 +119,7 @@ cd /d %BUILD_DIR%
|
|||
set COMMON_CMAKE_FLAGS=-DTINT_BUILD_DOCS=O -DTINT_BUILD_BENCHMARKS=1 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
|
||||
@echo off
|
||||
|
||||
call :status "Building tint"
|
||||
call :status "Building dawn"
|
||||
@echo on
|
||||
rem Disable msbuild "Intermediate or Output directory cannot reside in Temporary directory"
|
||||
set IgnoreWarnIntDirInTempDetected=true
|
||||
|
|
@ -148,13 +148,13 @@ set PATH=C:\Program Files\Metal Developer Tools\macos\bin;%PATH%
|
|||
where metal.exe
|
||||
set PATH=%DXC_PATH%;%OLD_PATH%
|
||||
where dxc.exe dxil.dll
|
||||
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose || goto :error
|
||||
call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose || goto :error
|
||||
@echo on
|
||||
set PATH=%OLD_PATH%
|
||||
rem Run again to test with FXC validation
|
||||
set PATH=%D3DCOMPILER_PATH%;%OLD_PATH%
|
||||
where d3dcompiler_47.dll
|
||||
call git bash -- ./test/tint/test-all.sh ../tint-build/tint.exe --verbose --format hlsl --fxc || goto :error
|
||||
call git bash -- ./test/tint/test-all.sh ../dawn-build/tint.exe --verbose --format hlsl --fxc || goto :error
|
||||
@echo on
|
||||
set PATH=%OLD_PATH%
|
||||
@echo off
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
@rem Copyright 2021 The Tint Authors.
|
||||
@rem Copyright 2021 The Tint and Dawn Authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/windows/cmake-msvc2019-debug/build.bat"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
@rem Copyright 2021 The Tint Authors.
|
||||
@rem Copyright 2021 The Tint and Dawn Authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "dawn/infra/kokoro/windows/cmake-msvc2019-release/build.bat"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-debug-asan/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-debug-ubsan/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-debug/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-release-asan/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-release-ubsan/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-clang-release/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-gcc-debug/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/linux/cmake-gcc-release/build.sh"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/windows/cmake-msvc2019-debug/build.bat"
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
# Format: //devtools/kokoro/config/proto/build.proto
|
||||
|
||||
build_file: "tint/kokoro/windows/cmake-msvc2019-release/build.bat"
|
||||
|
|
@ -24,7 +24,7 @@ if ! command -v cpplint.py &> /dev/null; then
|
|||
fi
|
||||
|
||||
FILTER="-runtime/references"
|
||||
FILES="`find src -type f` `find src/tint/cmd -type f`"
|
||||
FILES="`find src/tint -type f` `find src/tint/cmd -type f`"
|
||||
FILES+="`find tools/src -type f` `find src/tint/cmd -type f`"
|
||||
|
||||
if command -v go &> /dev/null; then
|
||||
|
|
|
|||
Loading…
Reference in New Issue