commit f0b097c2ff93df333facea667090fee36bb15f86
author Suren Baghdasaryan <surenb@google.com> Mon Nov 01 11:57:21 2021 -0700
committer Suren Baghdasaryan <surenb@google.com> Thu Nov 04 17:36:56 2021 -0700
tree 57a478d10057df45c5803aba97dd83511d8b1da7
parent e7b16559cce5a7e46c2c481dfea869812f000c43

libmeminfo_test: Use both product and board api level in the tests

For devices launching at S but with vendor implementation frozen at R
the tests should check both device api level ro.product.first_api_level
and board api level ro.board.first_api_level and use the minimum of
these values.

Bug: 203839958
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ie56900dd18e10c9f6b087bccd3ee872cc42bc827

libmeminfo_test.cpp

diff --git a/libmeminfo_test.cpp b/libmeminfo_test.cpp
index c41e4ff..bb7a84c 100644
--- a/libmeminfo_test.cpp
+++ b/libmeminfo_test.cpp
@@ -966,8 +966,19 @@
 
 TEST(SysMemInfo, TestReadGpuTotalUsageKb) {
     uint64_t size;
+    uint32_t device_api_level = android::base::GetIntProperty(
+            "ro.product.first_api_level",
+            android::base::GetIntProperty("ro.build.version.sdk", 0));
+    uint32_t board_api_level = android::base::GetIntProperty(
+            "ro.board.api_level",
+            android::base::GetIntProperty(
+                    "ro.board.first_api_level",
+                    android::base::GetIntProperty("ro.vendor.build.version.sdk", 0)));
+    uint32_t api_level = std::min(device_api_level, board_api_level);
 
-    if (android::base::GetIntProperty("ro.product.first_api_level", 0) < __ANDROID_API_S__) {
+    EXPECT_NE(api_level, 0) << "Failed to determine board API level";
+
+    if (api_level < __ANDROID_API_S__) {
         GTEST_SKIP();
     }
 

vts/vts_meminfo_test.cpp

diff --git a/vts/vts_meminfo_test.cpp b/vts/vts_meminfo_test.cpp
index a9b2c26..8f6b431 100644
--- a/vts/vts_meminfo_test.cpp
+++ b/vts/vts_meminfo_test.cpp
@@ -93,8 +93,19 @@
 // Android S and having 5.4 or higher kernel version.
 TEST(SysMemInfo, TestGpuTotalUsageKb) {
     uint64_t size;
+    uint32_t device_api_level = android::base::GetIntProperty(
+            "ro.product.first_api_level",
+            android::base::GetIntProperty("ro.build.version.sdk", 0));
+    uint32_t board_api_level = android::base::GetIntProperty(
+            "ro.board.api_level",
+            android::base::GetIntProperty(
+                    "ro.board.first_api_level",
+                    android::base::GetIntProperty("ro.vendor.build.version.sdk", 0)));
+    uint32_t api_level = std::min(device_api_level, board_api_level);
 
-    if (android::base::GetIntProperty("ro.product.first_api_level", 0) < __ANDROID_API_S__) {
+    EXPECT_NE(api_level, 0) << "Failed to determine board API level";
+
+    if (api_level < __ANDROID_API_S__) {
         GTEST_SKIP();
     }