diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-04 19:38:41 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-04 19:38:41 +0200 |
| commit | c4ba6b738f053b4503ff1232d594d7d135e71531 (patch) | |
| tree | f376f2005a2bc514781e4f94ca176378ab9a9f68 /tests | |
| parent | Merge "otautil: Only build the needed files for host build." (diff) | |
| parent | Merge changes I1cc5d702,I32ab9854 (diff) | |
| download | android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.gz android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.bz2 android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.lz android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.xz android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.tar.zst android_bootable_recovery-c4ba6b738f053b4503ff1232d594d7d135e71531.zip | |
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/component/updater_test.cpp | 2 | ||||
| -rw-r--r-- | tests/component/verifier_test.cpp | 4 | ||||
| -rw-r--r-- | tests/unit/dirutil_test.cpp | 3 | ||||
| -rw-r--r-- | tests/unit/sysutil_test.cpp | 5 | ||||
| -rw-r--r-- | tests/unit/zip_test.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index 5d3b2d996..48363a62b 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -40,10 +40,10 @@ #include "common/test_constants.h" #include "edify/expr.h" -#include "otautil/SysUtil.h" #include "otautil/error_code.h" #include "otautil/paths.h" #include "otautil/print_sha1.h" +#include "otautil/sysutil.h" #include "updater/blockimg.h" #include "updater/install.h" #include "updater/updater.h" diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp index 2ef3828ad..3246ecdbc 100644 --- a/tests/component/verifier_test.cpp +++ b/tests/component/verifier_test.cpp @@ -16,7 +16,6 @@ #include <errno.h> #include <fcntl.h> -#include <gtest/gtest.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> @@ -28,9 +27,10 @@ #include <android-base/file.h> #include <android-base/stringprintf.h> #include <android-base/test_utils.h> +#include <gtest/gtest.h> #include "common/test_constants.h" -#include "otautil/SysUtil.h" +#include "otautil/sysutil.h" #include "verifier.h" using namespace std::string_literals; diff --git a/tests/unit/dirutil_test.cpp b/tests/unit/dirutil_test.cpp index 7f85d13ea..1ca786c28 100644 --- a/tests/unit/dirutil_test.cpp +++ b/tests/unit/dirutil_test.cpp @@ -22,7 +22,8 @@ #include <android-base/test_utils.h> #include <gtest/gtest.h> -#include <otautil/DirUtil.h> + +#include "otautil/dirutil.h" TEST(DirUtilTest, create_invalid) { // Requesting to create an empty dir is invalid. diff --git a/tests/unit/sysutil_test.cpp b/tests/unit/sysutil_test.cpp index 434ee25bf..19fa4c59e 100644 --- a/tests/unit/sysutil_test.cpp +++ b/tests/unit/sysutil_test.cpp @@ -14,14 +14,13 @@ * limitations under the License. */ -#include <gtest/gtest.h> - #include <string> #include <android-base/file.h> #include <android-base/test_utils.h> +#include <gtest/gtest.h> -#include "otautil/SysUtil.h" +#include "otautil/sysutil.h" TEST(SysUtilTest, InvalidArgs) { MemMapping mapping; diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp index 827668521..47f33d9ea 100644 --- a/tests/unit/zip_test.cpp +++ b/tests/unit/zip_test.cpp @@ -23,10 +23,10 @@ #include <android-base/file.h> #include <android-base/test_utils.h> #include <gtest/gtest.h> -#include <otautil/SysUtil.h> #include <ziparchive/zip_archive.h> #include "common/test_constants.h" +#include "otautil/sysutil.h" TEST(ZipTest, OpenFromMemory) { std::string zip_path = from_testdata_base("ziptest_dummy-update.zip"); |