StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix zipalign tests with GetExecutableDirectory" am: 7bd7db619a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1490353

Change-Id: If98deaae1a73328e36ac036468faed1878059d0c
This commit is contained in:
Treehugger Robot
2020-11-07 23:32:11 +00:00
committed by Automerger Merge Worker
parent 3534f7ea31 7bd7db619a
commit 66e828f7ce
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/zipalign/Android.bp
View File

@@ -58,6 +58,7 @@ cc_test_host {
"tests/src/*_test.cpp", "tests/src/*_test.cpp",
], ],
static_libs: [ static_libs: [
"libbase",
"libzipalign", "libzipalign",
"libgmock", "libgmock",
], ],

15
tools/zipalign/tests/src/align_test.cpp
View File

@@ -4,12 +4,21 @@
#include "ZipAlign.h" #include "ZipAlign.h"
#include <stdio.h> #include <stdio.h>
#include <string>
#include <android-base/file.h>
using namespace android; using namespace android;
static std::string GetTestPath(const std::string& filename) {
static std::string test_data_dir = android::base::GetExecutableDirectory() + "/tests/data/";
return test_data_dir + filename;
}
TEST(Align, Unaligned) { TEST(Align, Unaligned) {
const char* src = "tests/data/unaligned.zip"; const std::string src = GetTestPath("unaligned.zip");
const char* dst = "tests/data/unaligned_out.zip"; const std::string dst = GetTestPath("unaligned_out.zip");
int result = process(src, dst, 4, true, false, 4096);
int result = process(src.c_str(), dst.c_str(), 4, true, false, 4096);
ASSERT_EQ(0, result); ASSERT_EQ(0, result);
} }