diff options
| author | Martin Stjernholm <mast@google.com> | 2021-06-02 00:35:39 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-06-09 17:02:35 +0100 |
| commit | 5602ad7fc2f7eabd7677adc2984fce03e35e011a (patch) | |
| tree | 4f1a378ee4cb654dd02bb89fd1e9a1dd6264ed53 /libnativeloader | |
| parent | 07f5e96d63121165b82635b6b7fa187ec3920612 (diff) | |
Fold the C API tests into the regular libnative{bridge,loader} tests.
They only need to be compiled. This way we avoid separate tests that
need gtest:false and that atest doesn't handle well (although there are
other reasons it doesn't handle libnativebridge-tests).
Cherry-picked from https://r.android.com/1723996.
Test: art/libnativebridge/tests/runtests.sh
atest libnativeloader_test
with and without a planted syntax error in the .c files
Bug: 122710865
Change-Id: I3225bdb7c2dd268c2cf9353b7ce89819e6d396a5
Merged-In: I3225bdb7c2dd268c2cf9353b7ce89819e6d396a5
Diffstat (limited to 'libnativeloader')
| -rw-r--r-- | libnativeloader/Android.bp | 1 | ||||
| -rw-r--r-- | libnativeloader/native_loader_api_test.c (renamed from libnativeloader/test/api_test.c) | 6 | ||||
| -rw-r--r-- | libnativeloader/test/Android.bp | 14 |
3 files changed, 1 insertions, 20 deletions
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp index 8b8fb27427..6e87620ed9 100644 --- a/libnativeloader/Android.bp +++ b/libnativeloader/Android.bp @@ -125,6 +125,7 @@ art_cc_test { host_supported: false, srcs: [ + "native_loader_api_test.c", "native_loader_test.cpp", ], cflags: ["-DANDROID"], diff --git a/libnativeloader/test/api_test.c b/libnativeloader/native_loader_api_test.c index e7025fd7a2..e7b9f2c1d6 100644 --- a/libnativeloader/test/api_test.c +++ b/libnativeloader/native_loader_api_test.c @@ -17,9 +17,3 @@ /* The main purpose of this test is to ensure this C header compiles in C, so * that no C++ features inadvertently leak into the C ABI. */ #include "nativeloader/native_loader.h" - -int main(int argc, char** argv) { - (void)argc; - (void)argv; - return 0; -} diff --git a/libnativeloader/test/Android.bp b/libnativeloader/test/Android.bp index 70e72d1f75..fb9ae0d9d3 100644 --- a/libnativeloader/test/Android.bp +++ b/libnativeloader/test/Android.bp @@ -78,17 +78,3 @@ cc_library { "libbase", ], } - -// Build the test for the C API. -cc_test { - name: "libnativeloader-api-tests", - defaults: [ - "art_defaults", - "art_test_defaults", - ], - srcs: [ - "api_test.c", - ], - header_libs: ["libnativeloader-headers"], - gtest: false, -} |