diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-31 23:09:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-08-31 23:15:05 +0200 |
| commit | d0ebb6e438dc8f7dcb5467ae6f72068cf40dcb7a (patch) | |
| tree | 52e1e3601fda8826323fa3d8c550b237de0d3c9b /solenv | |
| parent | Revert "exclude unnamed Library/Executable from ide integration" (diff) | |
| download | core-d0ebb6e438dc8f7dcb5467ae6f72068cf40dcb7a.tar.gz core-d0ebb6e438dc8f7dcb5467ae6f72068cf40dcb7a.zip | |
sal: don't use --target as parameter to cppunittester
CppunitTest_libreofficekit_tiledrendering hangs because the soffice_main
exits due to the unrecognized command line arg --target.
Use a -env:VARIABLE argument instead, which is filtered out by
rtl_getAppCommandArg() so does not reach the soffice_main code.
(regression from 87514b0907dfbb479e2646b5ff951c68babf3417)
Change-Id: I2c801305398dccfb447e4e5c44726f42bf2a72ef
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index bea33ebd7f01..f5cc1dfa1ff6 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -102,7 +102,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS) PYTHONDONTWRITEBYTECODE=1) \ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \ - $(call gb_CppunitTest__make_args) --target $@ \ + $(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \ $(if $(gb_CppunitTest__interactive),, \ > $@.log 2>&1 \ || ($(if $(value gb_CppunitTest_postprocess), \ |