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

Merge "Use result.Config.PrebuiltOS() to get prebuiltHost in test_spec_test" into main am: 9be9a126d1 am: b0f8d2a698

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2841420

Change-Id: I29d002dfbde26a569624d3be6bb0f2b00f1926ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-22 02:01:50 +00:00
committed by Automerger Merge Worker
parent 6bdf4aee70 b0f8d2a698
commit 22d89e0ab0
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(