diff options
| author | 2023-11-22 00:44:03 +0000 | |
|---|---|---|
| committer | 2023-11-22 00:44:03 +0000 | |
| commit | 9be9a126d12754b9f4b1f81f28ced50089b404fb (patch) | |
| tree | 33b0435dfbd963a7d27d8abf6328a4d7b4e31598 | |
| parent | 852b82e5c2008b47c508c941cd781c2f3f52db03 (diff) | |
| parent | 356296240e859d208209c46455ab87e7bd0af96a (diff) | |
Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main
| -rw-r--r-- | java/test_spec_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/test_spec_test.go b/java/test_spec_test.go index 22a8e60ee..39aff4cef 100644 --- a/java/test_spec_test.go +++ b/java/test_spec_test.go @@ -86,7 +86,8 @@ func TestTestSpec(t *testing.T) { // Tests for all_test_spec singleton. singleton := result.SingletonForTests("all_test_specs") rule := singleton.Rule("all_test_specs_rule") - expectedCmd := "out/soong/host/linux-x86/bin/metadata -rule test_spec -inputFile out/soong/all_test_spec_paths.rsp -outputFile out/soong/ownership/all_test_specs.pb" + prebuiltOs := result.Config.PrebuiltOS() + expectedCmd := "out/soong/host/" + prebuiltOs + "/bin/metadata -rule test_spec -inputFile out/soong/all_test_spec_paths.rsp -outputFile out/soong/ownership/all_test_specs.pb" expectedOutputFile := "out/soong/ownership/all_test_specs.pb" expectedInputFile := "out/soong/.intermediates/module-name/intermediateTestSpecMetadata.pb" if !strings.Contains( |