diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-29 22:53:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 05:40:36 +0000 |
| commit | 965f379b6ed2884f60b7fd6c0aae107fa5fceea7 (patch) | |
| tree | ca3da58f75cf92f8fadd4f9ab481baf3125aa79f /include/test | |
| parent | 11351e9a2e8f417772c33d36e5756c5e63d94984 (diff) | |
Break test::setUpVcl into a test-setupvcl library of its own
...so it can be gb_CppunitTest_use_library_objects-included in upcoming
<https://gerrit.libreoffice.org/#/c/28322/> "tdf#99402: fix Metafile Font
handling".
Executable_pdf2xml.mk linked against test since
b0da8f00a0d41f2b17639fcee4ed4956421e55c5 "Make pdf2xml usable at least from
within buildenv again", but that seems unnecessary and would now cause problems
when linking the pdf2xml executable on Linux, as the linker for whatever reason
wouldn't find the libtest-setupvcl.so referenced from libtest.so, even though
the latter has a proper DT_RPATH.
Change-Id: Iba5d80266520ce1f5dafedffa520d18e853f7ec5
Reviewed-on: https://gerrit.libreoffice.org/28473
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/test')
| -rw-r--r-- | include/test/setupvcl.hxx | 2 | ||||
| -rw-r--r-- | include/test/testdllapi.hxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/test/setupvcl.hxx b/include/test/setupvcl.hxx index b2b3afaf7b37..e7a1d08bba2c 100644 --- a/include/test/setupvcl.hxx +++ b/include/test/setupvcl.hxx @@ -17,7 +17,7 @@ namespace test { // Calls InitVCL etc.; needed from multiple places in the test infrastructure: -OOO_DLLPUBLIC_TEST void setUpVcl(); +OOO_DLLPUBLIC_TEST_SETUPVCL void setUpVcl(); } diff --git a/include/test/testdllapi.hxx b/include/test/testdllapi.hxx index 3e33b0b51ec0..c0a1eb02909b 100644 --- a/include/test/testdllapi.hxx +++ b/include/test/testdllapi.hxx @@ -28,6 +28,12 @@ #define OOO_DLLPUBLIC_TEST SAL_DLLPUBLIC_IMPORT #endif +#if defined OOO_DLLIMPLEMENTATION_TEST_SETUPVCL +#define OOO_DLLPUBLIC_TEST_SETUPVCL SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_TEST_SETUPVCL SAL_DLLPUBLIC_IMPORT +#endif + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |