encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add expectations.txt validation to presubmit" 

This reverts commit cde5589953.

Reason for revert: Script fails on Windows.

Original change's description:
> Add expectations.txt validation to presubmit
>
> Change-Id: Ibabdfbdf44b027a6e6441e140f23b2c2488f32dc
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112120
> Reviewed-by: Ben Clayton <bclayton@google.com>
> Commit-Queue: Austin Eng <enga@chromium.org>
> Kokoro: Kokoro <noreply+kokoro@google.com>

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I106ab755af5fde289c0d014bf3be77d93dfd0beb
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/112400
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Auto-Submit: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng 2022-11-30 13:59:55 +00:00 committed by Dawn LUCI CQ
parent 4c593c356b
commit 83e98c6ad9
2 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
go_presubmit_support.py
View File

@ -12,24 +12,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
def go_path(input_api):
go = input_api.os_path.join(input_api.change.RepositoryRoot(), "tools",
"golang", "bin", "go")
if input_api.is_windows:
go += '.exe'
return go
def RunGoTests(input_api, output_api): def RunGoTests(input_api, output_api):
results = [] results = []
try: try:
input_api.subprocess.check_call_out( go = input_api.os_path.join(input_api.change.RepositoryRoot(), "tools",
[go_path(input_api), "test", "./..."], "golang", "bin", "go")
stdout=input_api.subprocess.PIPE, if input_api.is_windows:
stderr=input_api.subprocess.PIPE, go += '.exe'
cwd=input_api.PresubmitLocalPath()) input_api.subprocess.check_call_out([go, "test", "./..."],
stdout=input_api.subprocess.PIPE,
stderr=input_api.subprocess.PIPE,
cwd=input_api.PresubmitLocalPath())
except input_api.subprocess.CalledProcessError as e: except input_api.subprocess.CalledProcessError as e:
results.append(output_api.PresubmitError('%s' % (e, ))) results.append(output_api.PresubmitError('%s' % (e, )))
return results return results

53
webgpu-cts/PRESUBMIT.py
View File

@ -1,53 +0,0 @@
# Copyright 2022 The Dawn & 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.
import sys
USE_PYTHON3 = True
def _DoCommonChecks(input_api, output_api):
sys.path += [input_api.change.RepositoryRoot()]
from go_presubmit_support import go_path
results = []
try:
tools_path = input_api.os_path.join(input_api.change.RepositoryRoot(),
'tools')
cts_bin = input_api.os_path.join(tools_path, 'bin', 'cts')
cmd = [
go_path(input_api), 'build', '-o', cts_bin,
input_api.os_path.join('.', 'cmd', 'cts')
]
input_api.subprocess.check_call_out(cmd,
stdout=input_api.subprocess.PIPE,
stderr=input_api.subprocess.PIPE,
cwd=input_api.os_path.join(
tools_path, 'src'))
cmd = [cts_bin, 'validate']
input_api.subprocess.check_call_out(
cmd,
stdout=input_api.subprocess.PIPE,
stderr=input_api.subprocess.PIPE,
cwd=input_api.change.RepositoryRoot())
except input_api.subprocess.CalledProcessError as e:
results.append(output_api.PresubmitError('%s' % (e, )))
return results
CheckChangeOnUpload = _DoCommonChecks
CheckChangeOnCommit = _DoCommonChecks