diff options
| author | 2023-11-21 22:40:27 +0000 | |
|---|---|---|
| committer | 2023-11-21 23:14:01 +0000 | |
| commit | 356296240e859d208209c46455ab87e7bd0af96a (patch) | |
| tree | 741719de5887aab116aa94942c443ec5a1f38875 | |
| parent | b12a98651d091e0cbfbb3cc2135747899296d562 (diff) | |
Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test
Bug: 312536783
Bug: 312536905
Test: m nothing --no-skip-soong-tests -j96
Change-Id: I1e12281927269d42ae796348b223030acfd6ecfa
| -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( |