Enable ninja-validations.sh

Update ninja to 1.11.1, which has validation actions, and enable ninja-validations.sh
google · Oct 5, 2023 · e37cedd · e37cedd
1 parent fe66697
commit e37cedd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 #!/bin/bash
-# TODO(ninja): enable once upstream ninja supports validations
 #
 # Copyright 2015 Google Inc. All rights reserved
 #