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

Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test

Browse Source 
Bug: 312536783
Bug: 312536905
Test: m nothing --no-skip-soong-tests -j96

Ignore-AOSP-First: CPing test_spec rule to udc-mainline-prod to support migration of test targets. Cherry pick of:aosp/2836072

Change-Id: I1e12281927269d42ae796348b223030acfd6ecfa
Merged-In: I1e12281927269d42ae796348b223030acfd6ecfa
This commit is contained in:
Aditya Choudhary
2023-11-21 22:40:27 +00:00
parent d860dd1b31
commit 5202fc918e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/test_spec_test.go
View File

@@ -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(