Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GraphicsStats#findRootPath and disable CacheManager#trimMemory tests am: 24921a0325

Browse Source 
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>
This commit is contained in:
Nolan Scobie
2023-01-10 17:57:05 +00:00
committed by Automerger Merge Worker
parent 85e8dbe6ae 24921a0325
commit 600da2e030
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/hwui/tests/unit/CacheManagerTests.cpp
View File

@@ -32,7 +32,8 @@ static size_t getCacheUsage(GrDirectContext* grContext) {
return cacheUsage; 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 width = DeviceInfo::get()->getWidth();
int32_t height = DeviceInfo::get()->getHeight(); int32_t height = DeviceInfo::get()->getHeight();
GrDirectContext* grContext = renderThread.getGrContext(); GrDirectContext* grContext = renderThread.getGrContext();

14
libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp
View File

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