Fix GraphicsStats#findRootPath and disable CacheManager#trimMemory tests

...in hwui_unit_tests

Test: atest hwui_unit_tests
Bug: 257123741
Bug: 258700630
Change-Id: Ibadb457d0c8f45ceca8153320ae5b896ae55bba2
This commit is contained in:
Nolan Scobie
2022-11-14 19:35:58 -05:00
parent f89a38ac32
commit 81787fbf20
2 changed files with 7 additions and 10 deletions

View File

@@ -32,7 +32,8 @@ static size_t getCacheUsage(GrDirectContext* grContext) {
return cacheUsage;
}
RENDERTHREAD_SKIA_PIPELINE_TEST(CacheManager, trimMemory) {
// TOOD(258700630): fix this test and re-enable
RENDERTHREAD_SKIA_PIPELINE_TEST(CacheManager, DISABLED_trimMemory) {
int32_t width = DeviceInfo::get()->getWidth();
int32_t height = DeviceInfo::get()->getHeight();
GrDirectContext* grContext = renderThread.getGrContext();

View File

@@ -14,17 +14,17 @@
* limitations under the License.
*/
#include <android-base/macros.h>
#include <gtest/gtest.h>
#include "protos/graphicsstats.pb.h"
#include "service/GraphicsStatsService.h"
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "protos/graphicsstats.pb.h"
#include "service/GraphicsStatsService.h"
using namespace android;
using namespace android::uirenderer;
@@ -49,11 +49,7 @@ std::string findRootPath() {
// No code left untested
TEST(GraphicsStats, findRootPath) {
#ifdef __LP64__
std::string expected = "/data/nativetest64/hwui_unit_tests";
#else
std::string expected = "/data/nativetest/hwui_unit_tests";
#endif
std::string expected = "/data/local/tmp/nativetest/hwui_unit_tests/" ABI_STRING;
EXPECT_EQ(expected, findRootPath());
}