cppunit/makefile.mk | 2 +-
cppunit/unix.patch | 15 +++++++++++++++
sal/cppunittester/cppunittester.cxx | 8 +++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit d3721e50005a909b55e153372809019ef1e893a6
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 17 20:21:05 2012 +0300
Handle CppUnit::DynamicLibraryManagerException
Change-Id: I81f9b133ffb03c225b276639f60ad5e7f38ec1ef
diff --git a/sal/cppunittester/cppunittester.cxx
b/sal/cppunittester/cppunittester.cxx
index a5fe700..346373f 100644
--- a/sal/cppunittester/cppunittester.cxx
+++ b/sal/cppunittester/cppunittester.cxx
@@ -53,6 +53,7 @@
#include "cppunit/TestRunner.h"
#include "cppunit/extensions/TestFactoryRegistry.h"
#include "cppunit/plugin/PlugInManager.h"
+#include "cppunit/plugin/DynamicLibraryManagerException.h"
#include "cppunit/portability/Stream.h"
#include "boost/noncopyable.hpp"
@@ -137,7 +138,12 @@ public:
// we statically link to the app executable.
#else
CppUnit::PlugInManager manager;
- manager.load(testlib, args);
+ try {
+ manager.load(testlib, args);
+ } catch (const CppUnit::DynamicLibraryManagerException &e) {
+ fprintf(stderr, "%s\n", e.what());
+ return false;
+ }
#endif
CppUnit::TestRunner runner;
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
commit b2315f6b7b7f3976c0ec5c470ae67ca4e8732643
Author: Tor Lillqvist <t...@iki.fi>
Date: Fri Aug 17 20:20:32 2012 +0300
Use dlerror()
Change-Id: Id4cb837d7c2441df1c46795a52385e2e0e605a46
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 446067d..03927e6 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -32,7 +32,7 @@ TARGET = cppunit
TARFILE_NAME=cppunit-1.13.0
TARFILE_MD5=0c65c839854edd43d9294d1431a2b292
-PATCH_FILES = windows.patch
+PATCH_FILES = windows.patch unix.patch
.IF "$(OS)" == "ANDROID"
PATCH_FILES += android.patch
diff --git a/cppunit/unix.patch b/cppunit/unix.patch
new file mode 100644
index 0000000..2c55463
--- /dev/null
+++ b/cppunit/unix.patch
@@ -0,0 +1,15 @@
+--- misc/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
++++ misc/build/cppunit-1.13.0/src/cppunit/UnixDynamicLibraryManager.cpp
+@@ -34,7 +34,11 @@
+ std::string
+ DynamicLibraryManager::getLastErrorDetail() const
+ {
+- return "";
++ const char *last_dlerror = ::dlerror();
++ if (last_dlerror != NULL)
++ return last_dlerror;
++ else
++ return "";
+ }
+
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
