Merge changes from topic "nscobie-hwui_unit_tests" am: 463a012834
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2381552 Change-Id: Ice333054551f2c0515c7174a71a9d4f44e076e71 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -15,6 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <android-base/macros.h>
|
#include <android-base/macros.h>
|
||||||
|
#include <gmock/gmock.h>
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -49,8 +50,14 @@ std::string findRootPath() {
|
|||||||
|
|
||||||
// No code left untested
|
// No code left untested
|
||||||
TEST(GraphicsStats, findRootPath) {
|
TEST(GraphicsStats, findRootPath) {
|
||||||
std::string expected = "/data/local/tmp/nativetest/hwui_unit_tests/" ABI_STRING;
|
// Different tools/infrastructure seem to push this to different locations. It shouldn't really
|
||||||
EXPECT_EQ(expected, findRootPath());
|
// matter where the binary is, so add new locations here as needed. This test still seems good
|
||||||
|
// as it's nice to understand the possibility space, and ensure findRootPath continues working
|
||||||
|
// as expected.
|
||||||
|
std::string acceptableLocations[] = {"/data/nativetest/hwui_unit_tests",
|
||||||
|
"/data/nativetest64/hwui_unit_tests",
|
||||||
|
"/data/local/tmp/nativetest/hwui_unit_tests/" ABI_STRING};
|
||||||
|
EXPECT_THAT(acceptableLocations, ::testing::Contains(findRootPath()));
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(GraphicsStats, saveLoad) {
|
TEST(GraphicsStats, saveLoad) {
|
||||||
|
|||||||
Reference in New Issue
Block a user