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

Commit d9fce569 authored by Nolan Scobie's avatar Nolan Scobie Committed by Android (Google) Code Review
Browse files

Merge changes I4a5f7548,Ibadb457d 

* changes:
  Enable hwui_unit_tests in presubmit for libs/hwui
  Fix GraphicsStats#findRootPath and disable CacheManager#trimMemory tests
parents 7e9b6513 4c8c4ab5

libs/hwui/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
    },

    {

      "name": "CtsAccelerationTestCases"

    },

    {

      "name": "hwui_unit_tests"

    }

  ],

  "imports": [

libs/hwui/tests/unit/CacheManagerTests.cpp

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

libs/hwui/tests/unit/GraphicsStatsServiceTests.cpp

+5 −9
Original line number Diff line number Diff line
@@ -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());

}