diff options
| author | Cole Faust <colefaust@google.com> | 2023-10-04 13:54:43 -0700 |
|---|---|---|
| committer | lberki <lberki@users.noreply.github.com> | 2023-10-05 11:38:51 +0200 |
| commit | e37cedd24e76b59887f2153ca56dc6d4e8065d72 (patch) | |
| tree | 5a90316ee248b7c28c1c8983c7594da1e993ef22 | |
| parent | fe66697ad8eddaa91feb19ea92cfe6a7226ea9b0 (diff) | |
| download | kati-e37cedd24e76b59887f2153ca56dc6d4e8065d72.tar.gz | |
Enable ninja-validations.sh
Update ninja to 1.11.1, which has validation actions,
and enable ninja-validations.sh
| -rw-r--r-- | .github/workflows/cpp-ci.yml | 2 | ||||
| -rw-r--r-- | run_test.go | 3 | ||||
| -rw-r--r-- | testcase/ninja_validations.sh | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/cpp-ci.yml b/.github/workflows/cpp-ci.yml index ca262a6..178d298 100644 --- a/.github/workflows/cpp-ci.yml +++ b/.github/workflows/cpp-ci.yml @@ -22,7 +22,7 @@ jobs: - name: install ninja run: | mkdir -p ${GITHUB_WORKSPACE}/ninja-bin; cd ${GITHUB_WORKSPACE}/ninja-bin - wget https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-linux.zip + wget https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip unzip ninja-linux.zip rm ninja-linux.zip echo "${GITHUB_WORKSPACE}/ninja-bin" >> "$GITHUB_PATH" diff --git a/run_test.go b/run_test.go index ffc3629..c8c12a5 100644 --- a/run_test.go +++ b/run_test.go @@ -240,10 +240,13 @@ func runKatiInScript(t *testing.T, script, dir string, isNinjaTest bool) string } args = append(args, "SHELL=/bin/bash") + var stderrb bytes.Buffer cmd := exec.Command(args[0], args[1:]...) cmd.Dir = dir + cmd.Stderr = &stderrb output, _ := cmd.Output() write("stdout", output) + write("stderr", stderrb.Bytes()) if isNinjaTest { output = normalize(output, normalizeNinja) } diff --git a/testcase/ninja_validations.sh b/testcase/ninja_validations.sh index cd77a01..33e9e7f 100644 --- a/testcase/ninja_validations.sh +++ b/testcase/ninja_validations.sh @@ -1,5 +1,4 @@ #!/bin/bash -# TODO(ninja): enable once upstream ninja supports validations # # Copyright 2015 Google Inc. All rights reserved # |