merge in oc-release history after reset to master
diff --git a/tests/Android.mk b/tests/Android.mk
index 3ab5ea6..c7d3325 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -90,6 +90,7 @@
component/bootloader_message_test.cpp \
component/edify_test.cpp \
component/imgdiff_test.cpp \
+ component/sideload_test.cpp \
component/uncrypt_test.cpp \
component/updater_test.cpp \
component/verifier_test.cpp
diff --git a/tests/component/bootloader_message_test.cpp b/tests/component/bootloader_message_test.cpp
index c32519d..0357acc 100644
--- a/tests/component/bootloader_message_test.cpp
+++ b/tests/component/bootloader_message_test.cpp
@@ -33,8 +33,10 @@
virtual void TearDown() override {
// Clear the BCB.
- std::string err;
- ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
+ if (has_misc) {
+ std::string err;
+ ASSERT_TRUE(clear_bootloader_message(&err)) << "Failed to clear BCB: " << err;
+ }
}
bool has_misc;
diff --git a/tests/component/sideload_test.cpp b/tests/component/sideload_test.cpp
new file mode 100644
index 0000000..ea93e9b
--- /dev/null
+++ b/tests/component/sideload_test.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <unistd.h>
+#include <gtest/gtest.h>
+
+TEST(SideloadTest, fusedevice) {
+ ASSERT_NE(-1, access("/dev/fuse", R_OK | W_OK));
+}