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

test-runner: Pass a relative path to tint 

Avoids absolute paths being emitted in diagnostics

Change-Id: Ic62af27e079ceac8d89735486edcaca75014b8c9
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/53382
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton 2021-06-04 20:02:45 +00:00 committed by Ben Clayton
parent 620d77e480
commit b175d91c7e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/src/cmd/test-runner/main.go
View File

@ -99,6 +99,10 @@ func run() error {
if !fileutils.IsExe(exe) { if !fileutils.IsExe(exe) {
return fmt.Errorf("'%s' not found or is not executable", exe) return fmt.Errorf("'%s' not found or is not executable", exe)
} }
exe, err := filepath.Abs(exe)
if err != nil {
return err
}
// Split the --filter flag up by ',', trimming any whitespace at the start and end // Split the --filter flag up by ',', trimming any whitespace at the start and end
globIncludes := strings.Split(filter, ",") globIncludes := strings.Split(filter, ",")
@ -200,7 +204,7 @@ func run() error {
go func() { go func() {
defer wg.Done() defer wg.Done()
for job := range jobs { for job := range jobs {
job.run(exe, dxcPath, xcrunPath, generateExpected, generateSkip) job.run(dir, exe, dxcPath, xcrunPath, generateExpected, generateSkip)
} }
}() }()
} }
@ -356,7 +360,7 @@ type job struct {
result *status result *status
} }
func (j job) run(exe, dxcPath, xcrunPath string, generateExpected, generateSkip bool) { func (j job) run(wd, exe, dxcPath, xcrunPath string, generateExpected, generateSkip bool) {
// Is there an expected output? // Is there an expected output?
expected := loadExpectedFile(j.file, j.format) expected := loadExpectedFile(j.file, j.format)
skipped := false skipped := false
@ -366,7 +370,15 @@ func (j job) run(exe, dxcPath, xcrunPath string, generateExpected, generateSkip
expected = strings.ReplaceAll(expected, "\r\n", "\n") expected = strings.ReplaceAll(expected, "\r\n", "\n")
args := []string{j.file, "--format", string(j.format)} file, err := filepath.Rel(wd, j.file)
if err != nil {
file = j.file
}
args := []string{
file,
"--format", string(j.format),
}
// Can we validate? // Can we validate?
switch j.format { switch j.format {
@ -383,7 +395,7 @@ func (j job) run(exe, dxcPath, xcrunPath string, generateExpected, generateSkip
} }
// Invoke the compiler... // Invoke the compiler...
ok, out := invoke(exe, args...) ok, out := invoke(wd, exe, args...)
out = strings.ReplaceAll(out, "\r\n", "\n") out = strings.ReplaceAll(out, "\r\n", "\n")
matched := expected == "" || expected == out matched := expected == "" || expected == out
@ -507,8 +519,9 @@ func formatWidth(b outputFormat) int {
} }
// invoke runs the executable 'exe' with the provided arguments. // invoke runs the executable 'exe' with the provided arguments.
func invoke(exe string, args ...string) (ok bool, output string) { func invoke(wd, exe string, args ...string) (ok bool, output string) {
cmd := exec.Command(exe, args...) cmd := exec.Command(exe, args...)
cmd.Dir = wd
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
str := string(out) str := string(out)
if err != nil { if err != nil {