diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-10 01:18:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-10 01:18:13 +0000 |
commit | 4666b65289b930773a067c2f4e949975749927b1 (patch) | |
tree | 7bc163e493a1dbbf8bddfc2fac9465ab52503bf7 | |
parent | 45197927803d7965cd9e05e815c4a15b53c29a6c (diff) | |
parent | 62de73aeb0c4ae058fe60aa16258a5c505da7664 (diff) | |
download | core-4666b65289b930773a067c2f4e949975749927b1.tar.gz |
Snap for 6667917 from 62de73aeb0c4ae058fe60aa16258a5c505da7664 to rvc-d1-release
Change-Id: I41858c2157b11e61b0981161bf93ed21e89f0bd6
-rw-r--r-- | init/init_test.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/init_test.cpp b/init/init_test.cpp index 07b472455..fa6574026 100644 --- a/init/init_test.cpp +++ b/init/init_test.cpp @@ -17,6 +17,7 @@ #include <functional> #include <android-base/file.h> +#include <android-base/properties.h> #include <gtest/gtest.h> #include "action.h" @@ -32,6 +33,8 @@ #include "service_parser.h" #include "util.h" +using android::base::GetIntProperty; + namespace android { namespace init { @@ -240,6 +243,10 @@ TEST(init, EventTriggerOrderMultipleFiles) { } TEST(init, RejectsCriticalAndOneshotService) { + if (GetIntProperty("ro.product.first_api_level", 10000) < 30) { + GTEST_SKIP() << "Test only valid for devices launching with R or later"; + } + std::string init_script = R"init( service A something |