Merge d0c3bf60c7baaaf7f6b7311f484d2b3c28f1cbe6 on remote branch
Change-Id: Id00c1266ef154a2630ff26dcf7af44951ef66460
diff --git a/api/bpf_native_test/BpfTest.cpp b/api/bpf_native_test/BpfTest.cpp
index 4ab69b1..7e104a3 100644
--- a/api/bpf_native_test/BpfTest.cpp
+++ b/api/bpf_native_test/BpfTest.cpp
@@ -48,6 +48,7 @@
TEST(BpfTest, bpfMapPinTest) {
SKIP_IF_BPF_NOT_SUPPORTED;
+ EXPECT_EQ(0, setrlimitForTest());
const char* bpfMapPath = "/sys/fs/bpf/testMap";
int ret = access(bpfMapPath, F_OK);
if (!ret) {
@@ -126,6 +127,8 @@
void SetUp() {
SKIP_IF_BPF_NOT_SUPPORTED;
+
+ EXPECT_EQ(0, setrlimitForTest());
int ret = access(TEST_PROG_PATH, R_OK);
// Always create a new program and remove the pinned program after program
// loading is done.
diff --git a/virtual_ab/Android.bp b/virtual_ab/Android.bp
index d8fe7ac..91a1f89 100644
--- a/virtual_ab/Android.bp
+++ b/virtual_ab/Android.bp
@@ -31,6 +31,11 @@
],
static_libs: [
"libbase",
+ "libfstab",
+ "liblog",
+ ],
+ header_libs: [
+ "libstorage_literals_headers",
],
}
diff --git a/virtual_ab/metadata_test.cpp b/virtual_ab/metadata_test.cpp
index 7a4576c..993f9d7 100644
--- a/virtual_ab/metadata_test.cpp
+++ b/virtual_ab/metadata_test.cpp
@@ -14,9 +14,12 @@
* limitations under the License.
*/
-#include <gtest/gtest.h>
#include <sys/statfs.h>
+#include <android-base/stringprintf.h>
+#include <fstab/fstab.h>
+#include <gtest/gtest.h>
+
static constexpr const char kMetadata[] = "/metadata";
TEST(Metadata, IsExt4) {
@@ -25,3 +28,24 @@
<< "Cannot statfs " << kMetadata << ": " << strerror(errno);
ASSERT_EQ(EXT4_SUPER_MAGIC, buf.f_type);
}
+
+TEST(Metadata, FstabEntryFlagsAreSet) {
+ android::fs_mgr::Fstab fstab;
+ ASSERT_TRUE(android::fs_mgr::ReadDefaultFstab(&fstab));
+
+ auto metadata_entry =
+ android::fs_mgr::GetEntryForMountPoint(&fstab, kMetadata);
+ ASSERT_NE(metadata_entry, nullptr)
+ << "Cannot find fstab entry for " << kMetadata;
+
+ const char* message_fmt = "Fstab entry for /metadata must have %s flag set.";
+
+ EXPECT_TRUE(metadata_entry->fs_mgr_flags.check)
+ << android::base::StringPrintf(message_fmt, "check");
+ EXPECT_TRUE(metadata_entry->fs_mgr_flags.formattable)
+ << android::base::StringPrintf(message_fmt, "formattable");
+ EXPECT_TRUE(metadata_entry->fs_mgr_flags.first_stage_mount)
+ << android::base::StringPrintf(message_fmt, "first_stage_mount");
+ EXPECT_TRUE(metadata_entry->fs_mgr_flags.wait)
+ << android::base::StringPrintf(message_fmt, "wait");
+}