| commit | 5317f2d48b30bc02a21b3160562022d5169d5045 | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Jun 30 14:35:00 2017 -0700 |
| committer | Josh Gao <jmgao@google.com> | Tue Oct 24 16:02:25 2017 -0700 |
| tree | b04664324e629828b947de297a3e23f664af7617 | |
| parent | 34cf31a81ba5099a69327c5182ceb4a7fe46c2a2 [diff] |
versioner: add extern "C" to tests. Bug: https://github.com/android-ndk/ndk/issues/440 Test: python run_tests.py Change-Id: Id893979146bc609a17bd1fa2a6bec6f10dfe4804
diff --git a/tools/versioner/tests/multiple_definition/expected_fail b/tools/versioner/tests/multiple_definition/expected_fail index 6c531bd..7070390 100644 --- a/tools/versioner/tests/multiple_definition/expected_fail +++ b/tools/versioner/tests/multiple_definition/expected_fail
@@ -1,7 +1,7 @@ versioner: conflicting inline definitions: declarations visible in: arm-9 [fob = 32], arm-9 [fob = 64], arm-12 [fob = 32], arm-12 [fob = 64] - static definition @ headers/foo.h:1:1 + static definition @ headers/foo.h:5:1 no availability - static definition @ headers/bar.h:1:1 + static definition @ headers/bar.h:5:1 no availability versioner: sanity check failed
diff --git a/tools/versioner/tests/multiple_definition/headers/bar.h b/tools/versioner/tests/multiple_definition/headers/bar.h index a9d0197..29592c6 100644 --- a/tools/versioner/tests/multiple_definition/headers/bar.h +++ b/tools/versioner/tests/multiple_definition/headers/bar.h
@@ -1,3 +1,11 @@ +#if defined(__cplusplus) +extern "C" { +#endif + static int foo() { return 0; } + +#if defined(__cplusplus) +} +#endif
diff --git a/tools/versioner/tests/multiple_definition/headers/foo.h b/tools/versioner/tests/multiple_definition/headers/foo.h index a9d0197..29592c6 100644 --- a/tools/versioner/tests/multiple_definition/headers/foo.h +++ b/tools/versioner/tests/multiple_definition/headers/foo.h
@@ -1,3 +1,11 @@ +#if defined(__cplusplus) +extern "C" { +#endif + static int foo() { return 0; } + +#if defined(__cplusplus) +} +#endif