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 /libnativebridge | |
| 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 'libnativebridge')
| -rw-r--r-- | libnativebridge/tests/Android.bp | 30 | ||||
| -rw-r--r-- | libnativebridge/tests/NativeBridgeApi.c | 6 |
2 files changed, 1 insertions, 35 deletions
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp index 785ccd9b3e..fa98f5ecee 100644 --- a/libnativebridge/tests/Android.bp +++ b/libnativebridge/tests/Android.bp @@ -107,6 +107,7 @@ cc_defaults { test_per_src: true, srcs: [ + "NativeBridgeApi.c", "CodeCacheCreate_test.cpp", "CodeCacheExists_test.cpp", "CodeCacheStatFail_test.cpp", @@ -152,32 +153,3 @@ cc_test { host_supported: false, shared_libs: ["libnativebridge_lazy"], } - -// Build the test for the C API. -cc_test { - name: "libnativebridge-api-tests", - defaults: [ - "art_defaults", - "art_test_defaults", - ], - // TODO(mast): Split up art_gtest_defaults so that it can be used for the - // following without pulling in lots of libs. - target: { - linux: { - cflags: [ - // gtest issue - "-Wno-used-but-marked-unused", - "-Wno-deprecated", - "-Wno-missing-noreturn", - ], - }, - }, - srcs: [ - "NativeBridgeApi.c", - ], - header_libs: [ - "jni_headers", - "libnativebridge-headers", - ], - gtest: false, -} diff --git a/libnativebridge/tests/NativeBridgeApi.c b/libnativebridge/tests/NativeBridgeApi.c index 7ab71fe814..8440b59991 100644 --- a/libnativebridge/tests/NativeBridgeApi.c +++ b/libnativebridge/tests/NativeBridgeApi.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 "nativebridge/native_bridge.h" - -int main(int argc, char** argv) { - (void)argc; - (void)argv; - return 0; -} |