Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d89e0a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I29d002dfbde26a569624d3be6bb0f2b00f1926ab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bdf4aee b0f8d2a6

java/test_spec_test.go

+2 −1
Original line number Diff line number Diff line
@@ -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(