From be148cc5dd5bbdfbe0d02b91f1f93f2cfae6bae2 Mon Sep 17 00:00:00 2001 From: Dominik Laskowski Date: Wed, 18 Sep 2019 15:28:31 -0700 Subject: SF: Fix sffakehwc_test setup registerAsService requires TREBLE_TESTING_OVERRIDE to be set. Bug: 123530318 Test: sffakehwc_test runs (though some test cases fail) Change-Id: I3e88844f7590f7b65be7c85f6802cf7aa349243c --- services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp | 4 +++- services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp index 51956ec970..4d2146810b 100644 --- a/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp +++ b/services/surfaceflinger/tests/fakehwc/FakeComposerUtils.cpp @@ -167,7 +167,9 @@ void FakeHwcEnvironment::SetUp() { } // TODO: Try registering the mock as the default service instead. property_set("debug.sf.hwc_service_name", "mock"); - // This allows the SurfaceFlinger to load a HIDL service not listed in manifest files. + + // This allows tests/SF to register/load a HIDL service not listed in manifest files. + setenv("TREBLE_TESTING_OVERRIDE", "true", true); property_set("debug.sf.treble_testing_override", "true"); } diff --git a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp index 093bcf576d..c949d7c1a9 100644 --- a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp +++ b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp @@ -171,7 +171,7 @@ void DisplayTest::SetUp() { mMockComposer = new MockComposerClient; sp client = new ComposerClient(mMockComposer); mFakeService = new FakeComposerService(client); - (void)mFakeService->registerAsService("mock"); + ASSERT_EQ(android::OK, mFakeService->registerAsService("mock")); android::hardware::ProcessState::self()->startThreadPool(); android::ProcessState::self()->startThreadPool(); -- cgit v1.2.3-59-g8ed1b