summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-04-24 02:51:45 +0200
committerTianjie Xu <xunchang@google.com>2018-04-24 18:56:55 +0200
commitffed57a7a3e5e82969b5998f759d09fbb6edd4e2 (patch)
tree41aea266bc76d17c4eadaa6b789410c0d66a2e2d /tests
parentMerge "update_verifier: Move to Soong." (diff)
downloadandroid_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar.gz
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar.bz2
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar.lz
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar.xz
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.tar.zst
android_bootable_recovery-ffed57a7a3e5e82969b5998f759d09fbb6edd4e2.zip
Diffstat (limited to '')
-rw-r--r--tests/component/applypatch_test.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index f19f28c60..292d76e43 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -31,6 +31,7 @@
#include <vector>
#include <android-base/file.h>
+#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <android-base/test_utils.h>
#include <android-base/unique_fd.h>
@@ -46,7 +47,7 @@
using namespace std::string_literals;
static void sha1sum(const std::string& fname, std::string* sha1, size_t* fsize = nullptr) {
- ASSERT_NE(nullptr, sha1);
+ ASSERT_TRUE(sha1 != nullptr);
std::string data;
ASSERT_TRUE(android::base::ReadFileToString(fname, &data));
@@ -68,6 +69,14 @@ static void mangle_file(const std::string& fname) {
ASSERT_TRUE(android::base::WriteStringToFile(content, fname));
}
+static void test_logger(android::base::LogId /* id */, android::base::LogSeverity severity,
+ const char* /* tag */, const char* /* file */, unsigned int /* line */,
+ const char* message) {
+ if (severity >= android::base::GetMinimumLogSeverity()) {
+ fprintf(stdout, "%s\n", message);
+ }
+}
+
class ApplyPatchTest : public ::testing::Test {
public:
virtual void SetUp() override {
@@ -109,6 +118,8 @@ class ApplyPatchModesTest : public ::testing::Test {
protected:
void SetUp() override {
CacheLocation::location().set_cache_temp_source(cache_source.path);
+ android::base::InitLogging(nullptr, &test_logger);
+ android::base::SetMinimumLogSeverity(android::base::LogSeverity::DEBUG);
}
TemporaryFile cache_source;