tools: Replace copy-pasta scripts
There were a bunch of helper scripts to build a go tool and run it. Replace these with a single 'run' command that takes the tool name and arguments. Helps reduce maintainance, file spew. Also add the 'tools/bin' directory to .gitignore. These are the cached tool binaries. Bug: dawn:1339 Change-Id: I012c966736b4d93949f6142c342cdcfefa9f0083 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86063 Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
parent
aba5a212ca
commit
9f49ac5493
|
@ -31,6 +31,7 @@
|
||||||
/third_party/vulkan_memory_allocator
|
/third_party/vulkan_memory_allocator
|
||||||
/third_party/webgpu-cts
|
/third_party/webgpu-cts
|
||||||
/third_party/zlib
|
/third_party/zlib
|
||||||
|
/tools/bin
|
||||||
/tools/clang
|
/tools/clang
|
||||||
/tools/cmake*
|
/tools/cmake*
|
||||||
/tools/golang
|
/tools/golang
|
||||||
|
|
|
@ -22,8 +22,8 @@ function usage() {
|
||||||
echo "test-all.sh is a simple wrapper around <tint>/tools/test-runner that"
|
echo "test-all.sh is a simple wrapper around <tint>/tools/test-runner that"
|
||||||
echo "injects the <tint>/test directory as the second command line argument"
|
echo "injects the <tint>/test directory as the second command line argument"
|
||||||
echo
|
echo
|
||||||
echo "Usage of <tint>/tools/test-runner:"
|
echo "Usage of test-runner:"
|
||||||
"${SCRIPT_DIR}/../../tools/test-runner" --help
|
"${SCRIPT_DIR}/../../tools/run" "test-runner" --help
|
||||||
}
|
}
|
||||||
|
|
||||||
TINT="$1"
|
TINT="$1"
|
||||||
|
@ -41,4 +41,4 @@ if [ ! -x "$TINT" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SCRIPT_DIR}/../../tools/test-runner" "${@:2}" "${TINT}" "${SCRIPT_DIR}"
|
"${SCRIPT_DIR}/../../tools/run" "test-runner" "${@:2}" "${TINT}" "${SCRIPT_DIR}"
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/builtin-gen"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/builtin-gen" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/check-spec-examples"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/check-spec-examples" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,35 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
# See https://clang.llvm.org/docs/SourceBasedCodeCoverage.html
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/fix-tests"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/fix-tests" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/gerrit-stats"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/gerrit-stats" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/get-test-plan"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/get-test-plan" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -15,19 +15,41 @@
|
||||||
|
|
||||||
set -e # Fail on any error.
|
set -e # Fail on any error.
|
||||||
|
|
||||||
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
||||||
|
TOOL="$1"
|
||||||
|
BINARY="${SCRIPT_DIR}/bin/${TOOL}"
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
if [ ! -x "$(which go)" ] ; then
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
echo "error: go needs to be on \$PATH to use $0"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
function list_tools() {
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
echo "Available tools:"
|
||||||
BINARY="${SCRIPT_DIR}/bin/benchdiff"
|
ls "${SCRIPT_DIR}/src/cmd"
|
||||||
|
}
|
||||||
|
|
||||||
|
function show_usage() {
|
||||||
|
echo "run <tool> <args>"
|
||||||
|
echo
|
||||||
|
echo "builds and runs the go tool in <dawn>/tools/src/cmd"
|
||||||
|
echo
|
||||||
|
list_tools
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if [ -z "${TOOL}" ]; then
|
||||||
|
show_usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -d "${SCRIPT_DIR}/src/cmd/${TOOL}" ]; then
|
||||||
|
show_usage
|
||||||
|
fi
|
||||||
|
|
||||||
# Rebuild the binary.
|
# Rebuild the binary.
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
# Note, go caches build artifacts, so this is quick for repeat calls
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/benchdiff" > /dev/null
|
pushd "${SCRIPT_DIR}/src" > /dev/null
|
||||||
go build -o "${BINARY}" main.go
|
go build -o "${BINARY}" "./cmd/${TOOL}"
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
"${BINARY}" "${@:2}"
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/snippets"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/snippets" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/test-runner"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/test-runner" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
|
@ -1,33 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
# Copyright 2021 The Tint Authors
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
|
|
||||||
set -e # Fail on any error.
|
|
||||||
|
|
||||||
if [ ! -x "$(which go)" ] ; then
|
|
||||||
echo "error: go needs to be on \$PATH to use $0"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
|
|
||||||
ROOT_DIR="$( cd "${SCRIPT_DIR}/.." >/dev/null 2>&1 && pwd )"
|
|
||||||
BINARY="${SCRIPT_DIR}/bin/trim-includes"
|
|
||||||
|
|
||||||
# Rebuild the binary.
|
|
||||||
# Note, go caches build artifacts, so this is quick for repeat calls
|
|
||||||
pushd "${SCRIPT_DIR}/src/cmd/trim-includes" > /dev/null
|
|
||||||
go build -o "${BINARY}" main.go
|
|
||||||
popd > /dev/null
|
|
||||||
|
|
||||||
"${BINARY}" "$@"
|
|
Loading…
Reference in New Issue