summaryrefslogtreecommitdiff
path: root/unotest
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-30 18:23:23 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-07-30 18:23:23 +0200
commit62df5aabcdb3dc99ada137a5fa06707ec671d1fe (patch)
treef696cc4e51f901e2f3e557e04b83288e96a61651 /unotest
parenta604a49512d23894b72050d1112b09b2f6f49c96 (diff)
gdb-core-bt.sh expects three arguments now
...since 29b59f2e87d1b00ab6a1f4cc4e960603974992bc "gdb-core-bt: don't talk about core files without a reason." Change-Id: I45640a5724fd98faf3a7c1e44e904f880cc9fc6a
Diffstat (limited to 'unotest')
-rw-r--r--unotest/source/java/org/openoffice/test/OfficeConnection.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index de6e7054ff4b..5ecf3b6bca86 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -104,6 +104,7 @@ public final class OfficeConnection {
throws InterruptedException, com.sun.star.uno.Exception
{
boolean cleanTermination = false;
+ int code = 0;
try {
boolean desktopTerminated = true;
if (process != null) {
@@ -140,7 +141,6 @@ public final class OfficeConnection {
process.destroy();
}
}
- int code = 0;
if (process != null) {
code = process.waitFor();
}
@@ -165,7 +165,7 @@ public final class OfficeConnection {
ProcessBuilder pb = new ProcessBuilder(
postprocesscommand,
sofficeArg.substring("path:".length()) + ".bin",
- workdir);
+ workdir, String.valueOf(code));
Process postprocess = pb.start();
Forward ppoutForward = new Forward(
postprocess.getInputStream(), System.out);
@@ -173,7 +173,7 @@ public final class OfficeConnection {
Forward pperrForward = new Forward(
postprocess.getErrorStream(), System.err);
pperrForward.start();
- int code = postprocess.waitFor();
+ code = postprocess.waitFor();
if (code != 0) {
throw new PostprocessFailedException(code);
}