svn commit: r1707955 - in /openoffice/trunk/main: ./ solenv/gbuild/ solenv/gbuild/platform/ solenv/inc/
Author: damjan Date: Sun Oct 11 08:09:10 2015 New Revision: 1707955 URL: http://svn.apache.org/viewvc?rev=1707955=rev Log: #i125003# Eliminate cppunit from our tree completely. Removed: openoffice/trunk/main/solenv/gbuild/CppunitTest.mk openoffice/trunk/main/solenv/inc/_cppunit.mk openoffice/trunk/main/solenv/inc/cppunit.mk Modified: openoffice/trunk/main/RepositoryFixes.mk openoffice/trunk/main/configure.ac openoffice/trunk/main/set_soenv.in openoffice/trunk/main/solenv/gbuild/TargetLocations.mk openoffice/trunk/main/solenv/gbuild/gbuild.mk openoffice/trunk/main/solenv/gbuild/platform/freebsd.mk openoffice/trunk/main/solenv/gbuild/platform/linux.mk openoffice/trunk/main/solenv/gbuild/platform/macosx.mk openoffice/trunk/main/solenv/gbuild/platform/os2.mk openoffice/trunk/main/solenv/gbuild/platform/solaris.mk openoffice/trunk/main/solenv/gbuild/platform/windows.mk openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk openoffice/trunk/main/solenv/inc/installationtest.mk openoffice/trunk/main/solenv/inc/libs.mk openoffice/trunk/main/solenv/inc/settings.mk Modified: openoffice/trunk/main/RepositoryFixes.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1707955=1707954=1707955=diff == --- openoffice/trunk/main/RepositoryFixes.mk (original) +++ openoffice/trunk/main/RepositoryFixes.mk Sun Oct 11 08:09:10 2015 @@ -60,7 +60,6 @@ endif ifeq ($(OS),WNT) ifneq ($(USE_MINGW),) gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:libcppunit.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) @@ -105,7 +104,6 @@ gb_Library_TARGETS := $(filter-out stl,$ else gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:icui%,cui:icuin%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:iii18nisolang1%,i18nisolang1:iii18nisolang%,$(gb_Library_FILENAMES)) @@ -164,7 +162,6 @@ ifeq ($(OS),OS2) gb_Library_FILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppu:cppu%,cppu:cppu3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:cppuhelper%,cppuhelper:cppuh3%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES)) Modified: openoffice/trunk/main/configure.ac URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1707955=1707954=1707955=diff == --- openoffice/trunk/main/configure.ac (original) +++ openoffice/trunk/main/configure.ac Sun Oct 11 08:09:10 2015 @@ -639,9 +639,6 @@ AC_ARG_WITH(system-libtextcat, AC_ARG_WITH(external-libtextcat-data, [ --with-system-libtextcat-data Use libtextcat data already on system ],,) -AC_ARG_WITH(system-cppunit, -[ --with-system-cppunit Use cppunit already on system -],,) AC_ARG_WITH(system-redland, [ --with-system-redland Use redland library already on system ],,) @@ -3801,34 +3798,6 @@ AC_SUBST(LIBWPD_CFLAGS) AC_SUBST(LIBWPD_LIBS) dnl === -dnl Check for system cppunit -dnl === -WITH_CPPUNIT= -AC_MSG_CHECKING([which cppunit to use]) -if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ -test "$with_system_cppunit" != "no"; then -SYSTEM_CPPUNIT=YES -# might work for earlier, too but go sure: -PKG_CHECK_MODULES( CPPUNIT, - cppunit >= 1.12.0, - WITH_CPPUNIT="YES", - WITH_CPPUNIT="") -if test -n "$WITH_CPPUNIT"; then - AC_MSG_RESULT([found system cppunit $CPPUNIT]) -else - AC_MSG_WARN([dit not find system cppunit version
buildbot success in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a passing build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/98 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1707966 - /openoffice/trunk/test/build.xml
Author: damjan Date: Sun Oct 11 11:57:53 2015 New Revision: 1707966 URL: http://svn.apache.org/viewvc?rev=1707966=rev Log: When ./configure --with-package-format=installed is used, allow tests to run from the resulting install directory instead of needing an archive. Modified: openoffice/trunk/test/build.xml Modified: openoffice/trunk/test/build.xml URL: http://svn.apache.org/viewvc/openoffice/trunk/test/build.xml?rev=1707966=1707965=1707966=diff == --- openoffice/trunk/test/build.xml (original) +++ openoffice/trunk/test/build.xml Sun Oct 11 11:57:53 2015 @@ -139,9 +139,19 @@ + + + + + + + + + @@ -150,6 +160,7 @@ +
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/96 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1707970 - /openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java
Author: damjan Date: Sun Oct 11 12:34:16 2015 New Revision: 1707970 URL: http://svn.apache.org/viewvc?rev=1707970=rev Log: Fix a test that hangs on the "Do you want to save your changes?" dialog at exit. Modified: openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java Modified: openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java URL: http://svn.apache.org/viewvc/openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java?rev=1707970=1707969=1707970=diff == --- openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java (original) +++ openoffice/trunk/test/testgui/source/bvt/gui/BasicFunctionTest.java Sun Oct 11 12:34:16 2015 @@ -325,6 +325,7 @@ public class BasicFunctionTest { assertEquals( "Apache Awesome OpenOffice is comprised of six personal productivity applications: a word processor (and its web-authoring component), spreadsheet, presentation graphics, drawing, equation editor, and database. Awesome OpenOffice is released on Windows, Solaris, Linux and Macintosh operation systems, with more communities joining, including a mature FreeBSD port. Awesome OpenOffice is localized, supporting over 110 languages worldwide. ", copyAll()); + discard(); } @Test
buildbot success in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a passing build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/92 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a failed build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/108 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: BUILD FAILED: failed build --all Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux32-nightly
The Buildbot has detected a passing build on builder openoffice-linux32-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux32-nightly/builds/112 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm2_ubuntu_32bit Build Reason: The Nightly scheduler named 'openoffice-linux32-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot