StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quote aquery commands.

Browse Source 
Bazel run shell actions begin `bin/bash -c <command>`, without escaping,
the command can be treated as an argument to `bin/bash`.

Test: build/bazel/mixed_droid.sh
Change-Id: I423cb393da2e6ac97448ec77b2596f12670dfd31
This commit is contained in:
Liz Kammer
2021-11-16 17:01:11 -05:00
parent ddeab21340
commit c31929962b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bazel/aquery_test.go
View File

@@ -709,7 +709,7 @@ func TestTransitiveInputDepsets(t *testing.T) {
}
expectedBuildStatements := []BuildStatement{
BuildStatement{
Command: "/bin/bash -c touch bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out",
Command: "/bin/bash -c 'touch bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out'",
OutputPaths: []string{"bazel-out/sourceroot/k8-fastbuild/bin/testpkg/test_out"},
InputPaths: inputPaths,
Mnemonic: "Action",
@@ -1378,7 +1378,7 @@ func assertError(t *testing.T, err error, expected string) {
func assertBuildStatements(t *testing.T, expected []BuildStatement, actual []BuildStatement) {
t.Helper()
if len(expected) != len(actual) {
t.Errorf("expected %d build statements, but got %d,\n expected: %v,\n actual: %v",
t.Errorf("expected %d build statements, but got %d,\n expected: %#v,\n actual: %#v",
len(expected), len(actual), expected, actual)
return
}
@@ -1389,7 +1389,7 @@ ACTUAL_LOOP:
continue ACTUAL_LOOP
}
}
t.Errorf("unexpected build statement %v.\n expected: %v",
t.Errorf("unexpected build statement %#v.\n expected: %#v",
actualStatement, expected)
return
}