diff options
| author | 2023-01-10 17:57:05 +0000 | |
|---|---|---|
| committer | 2023-01-10 17:57:05 +0000 | |
| commit | 600da2e030e67517c2e2ee11cd20e50e21fcb3ee (patch) | |
| tree | c774014cdd8f0a8322698d6672e2180a1d8c98ea | |
| parent | 85e8dbe6ae959e4cf4f9ca59c1ac08421fca779d (diff) | |
| parent | 24921a0325cf88f8ee464d8fc026cf257b0e83ee (diff) | |
Fix GraphicsStats#findRootPath and disable CacheManager#trimMemory tests am: 24921a0325
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2379069
Change-Id: Icab9f94d9edcb350a5ed7bc52969c06200cdb589
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/hwui/tests/unit/CacheManagerTests.cpp | 3 | ||||
| -rw-r--r-- | libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp | 14 |
2 files changed, 7 insertions, 10 deletions
diff --git a/libs/hwui/tests/unit/CacheManagerTests.cpp b/libs/hwui/tests/unit/CacheManagerTests.cpp index edd3e4e4f4d4..fc84abb1d605 100644 --- a/libs/hwui/tests/unit/CacheManagerTests.cpp +++ b/libs/hwui/tests/unit/CacheManagerTests.cpp @@ -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(); diff --git a/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp b/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp index 098b4ccea8cf..92fd8294a486 100644 --- a/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp +++ b/libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp @@ -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()); } |