[Libreoffice-commits] .: 3 commits - solenv/gbuild ucb/source unotest/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Fri Dec 16 06:02:27 PST 2011


 solenv/gbuild/platform/unxgcc_gdbforjunit.sh                  |    2 +-
 ucb/source/inc/regexpmap.tpt                                  |    1 -
 unotest/source/java/org/openoffice/test/OfficeConnection.java |    5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 0bb3af8934ed1cdce22941a279c32ec2704397b0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 14:59:47 2011 +0100

    Handle unset workdir argument.

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index ae2cae0..da99d0d 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -67,7 +67,10 @@ public final class OfficeConnection {
                 "--accept=" + description + ";urp",
                 "-env:UserInstallation=" + Argument.get("user"),
                 "-env:UNO_JAVA_JFW_ENV_JREHOME=true");
-            pb.directory(new File(Argument.get("workdir")));
+            String workdirArg = Argument.get("workdir");
+            if (workdirArg != null) {
+                pb.directory(new File(workdirArg));
+            }
             String envArg = Argument.get("env");
             if (envArg != null) {
                 Map<String, String> env = pb.environment();
commit 54a918bbfba47734d414832755e35434da103ed5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 14:56:32 2011 +0100

    Report backtraces for all threads.

diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
index 730d2e9..0341e7b 100755
--- a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -44,7 +44,7 @@ then
         echo "Found a core dump at ${COREFILE}"
         echo "Stacktrace:"
         GDBCOMMANDFILE=`mktemp`
-        echo "bt" > ${GDBCOMMANDFILE}
+        echo "thread apply all bt" > ${GDBCOMMANDFILE}
         gdb -x $GDBCOMMANDFILE --batch ${OFFICEFILE}.bin ${COREFILE}
         rm ${GDBCOMMANDFILE}
         echo
commit 3c1b0a5a67d10798e5d1ca391f7c5eb95e6f1aea
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 16 14:15:02 2011 +0100

    Remove nonsense line (causing debug-mode glibc to report an error).

diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 9d4a7fb..4fe69a6 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -152,7 +152,6 @@ RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap,
 	if (bBegin)
 	{
 		m_nList = -1;
-		m_aIndex = typename List< Val >::iterator();
 		if (!m_pMap->m_pDefault)
 			next();
 	}


More information about the Libreoffice-commits mailing list