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

1 files changed, 8 insertions, 4 deletions

diff --git a/sal/cppunittester/cppunittester.cxx b/sal/cppunittester/cppunittester.cxx
index a57ea5501caf..e67c47610511 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -361,15 +361,19 @@ SAL_IMPLEMENT_MAIN()
         std::string args;
         std::string testlib;
         sal_uInt32 index = 0;
-        while (index < rtl_getAppCommandArgCount())
+        while (index < osl_getCommandArgCount())
         {
             rtl::OUString arg = getArgument(index);
-            if (arg == "--target")
+            if (arg.startsWith("-env:CPPUNITTESTTARGET=", &path))
             {
-                path = getArgument(++index);
                 ++index;
                 continue;
             }
+            if (arg.startsWith("-env:"))
+            {
+                ++index;
+                continue; // ignore it here - will be read later
+            }
             if ( arg != "--protector" )
             {
                 if (testlib.empty())
@@ -385,7 +389,7 @@ SAL_IMPLEMENT_MAIN()
                 ++index;
                 continue;
             }
-            if (rtl_getAppCommandArgCount() - index < 3) {
+            if (osl_getCommandArgCount() - index < 3) {
                 usageFailure();
             }
             rtl::OUString lib(getArgument(index + 1));