desktop/source/app/cmdlineargs.cxx | 14 --------------
desktop/source/app/cmdlinehelp.cxx | 3 +--
desktop/unx/source/args.c | 13 -------------
uitest/libreoffice/connection.py | 2 +-
4 files changed, 2 insertions(+), 30 deletions(-)
New commits:
commit 67a2317be8a46b3254475c689e8eca5e9acd45ab
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Oct 4 10:05:18 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Oct 4 12:44:27 2019 +0200
Revert "uitest: make child soffice process die when parent dies"
This reverts commit d35840a2111beafe018851314a624e268e3cde6a, now that
43aef04d77aafb9d055957642e62b559231f3711 "Reliably wait for soffice to
terminate" makes sure that no soffice-related processes are left behind by
UITests. Using PR_SET_PDEATHSIG had the following drawbacks:
* It defeats debugging if a runaway process is forcefully killed by the test
framework. (And there are already higher-layer mechanisms in place for
the
reliable termination of runaway tinderbox builds, see the commit message
of
43aef04d77aafb9d055957642e62b559231f3711 mentioned above.)
* It is brittle in that it can terminate soffice-related processes too
early, as
the signal is sent as soon as the parent's thread that spawned the child
(and
not the parent process as a whole) terminates.
* It is Linux-only.
Change-Id: Ia07f5dbaafc824bad0dfbdb1a2aabe6d5508741b
Reviewed-on: https://gerrit.libreoffice.org/80186
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index 46395ae87133..381147cd534e 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -42,11 +42,6 @@
#include <osl/file.hxx>
#include <sal/log.hxx>
-#ifdef LINUX
-#include <sys/prctl.h>
-#include <signal.h>
-#endif
-
using namespace com::sun::star::lang;
using namespace com::sun::star::uri;
using namespace com::sun::star::uno;
@@ -367,15 +362,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier&
supplier )
{
// Do nothing, accept only for backward compatibility
}
- else if ( oArg == "dont-survive-parent" )
- {
-// only supported on linux for now
-#ifdef LINUX
- prctl(PR_SET_PDEATHSIG, SIGKILL);
-#else
- fprintf(stderr, "Warning: dont-survive-parent is not supported on
this platform (yet).\n");
-#endif
- }
else if ( oArg == "nologo" )
{
m_nologo = true;
diff --git a/desktop/source/app/cmdlinehelp.cxx
b/desktop/source/app/cmdlinehelp.cxx
index b6afe63fe57a..bdb04bb9d4d8 100644
--- a/desktop/source/app/cmdlinehelp.cxx
+++ b/desktop/source/app/cmdlinehelp.cxx
@@ -112,8 +112,7 @@ namespace desktop
"Developer arguments:
\n"
" --terminate_after_init
\n"
" Exit after initialization complete (no
documents loaded)\n"
- " --eventtesting Exit after loading documents.
\n"
- " --dont-survive-parent Exit when the parent exits (linux only)
\n\n"
+ " --eventtesting Exit after loading documents.
\n\n"
"New document creation arguments:
\n"
"The arguments create an empty document of specified kind. Only one of
them may \n"
"be used in one command line. If filenames are specified after an
argument, \n"
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 81a8dbca4bb5..199b58a8e50e 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -9,10 +9,6 @@
#include <stdlib.h>
#include <string.h>
#include <osl/process.h>
-#ifdef LINUX
-#include <sys/prctl.h>
-#include <signal.h>
-#endif
#include "args.h"
@@ -125,15 +121,6 @@ Args *args_parse (void)
args->pPageinType = pArgDescr[j].pPageinType;
break;
}
- if (rtl_ustr_ascii_compare_WithLength(
- arg, length, "dont-survive-parent")
- == 0)
- {
-#ifdef LINUX
- prctl(PR_SET_PDEATHSIG, SIGKILL);
-#endif
- break;
- }
}
}
diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py
index 12917555a2fe..cb3ae1a0128e 100644
--- a/uitest/libreoffice/connection.py
+++ b/uitest/libreoffice/connection.py
@@ -66,7 +66,7 @@ class OfficeConnection:
argv = [soffice, "--accept=" + socket + ";urp",
"-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard",
- "--norestore", "--nologo", "--dont-survive-parent"]
+ "--norestore", "--nologo"]
if "--valgrind" in self.args:
argv.append("--valgrind")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
