[ooo-build-commit] 3 commits - bin/build-ooo bin/tinbuild patches/unittesting
Thorsten Behrens
thorsten at kemper.freedesktop.org
Mon Aug 10 14:31:07 PDT 2009
bin/build-ooo | 3
bin/tinbuild | 6
patches/unittesting/unittesting-build-pl.diff | 151 +++++++++-
patches/unittesting/unittesting-more-sw.diff | 374 ++++++++++++++++++++++++++
patches/unittesting/unittesting-tools.diff | 15 -
patches/unittesting/unittesting-ucb.diff | 2
6 files changed, 525 insertions(+), 26 deletions(-)
New commits:
commit c5f4e15068cc41e0ee38e304ddfc617957ddd195
Author: Thorsten Behrens <thb at openoffice.org>
Date: Tue Aug 11 16:51:02 2009 +0200
Initial work to have the writer core unit-tested
* patches/unittesting/unittesting-more-sw.diff: the patch
diff --git a/patches/unittesting/unittesting-more-sw.diff b/patches/unittesting/unittesting-more-sw.diff
new file mode 100644
index 0000000..73d2996
--- /dev/null
+++ b/patches/unittesting/unittesting-more-sw.diff
@@ -0,0 +1,374 @@
+Some lame unit tests actually using writer core
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ sw/qa/core/Test-BigPtrArray.cxx | 2 -
+ sw/qa/core/makefile.mk | 68 +++++++++++++++++++
+ sw/qa/core/swdoc-test.cxx | 135 +++++++++++++++++++++++++++++++++++++
+ sw/source/core/bastyp/init.cxx | 15 +++-
+ sw/source/core/bastyp/makefile.mk | 1
+ tools/source/rc/resmgr.cxx | 37 ++++------
+ 6 files changed, 230 insertions(+), 28 deletions(-)
+ create mode 100644 sw/qa/core/swdoc-test.cxx
+
+
+diff --git sw/qa/core/Test-BigPtrArray.cxx sw/qa/core/Test-BigPtrArray.cxx
+index 4b0f9a5..b759917 100644
+--- sw/qa/core/Test-BigPtrArray.cxx
++++ sw/qa/core/Test-BigPtrArray.cxx
+@@ -34,7 +34,7 @@
+
+ #include <cppunit/simpleheader.hxx>
+ #include <bparr.hxx>
+-#include <string>
++#include <string.h>
+ #include <stdlib.h>
+ #include <rtl/logfile.hxx>
+
+diff --git sw/qa/core/makefile.mk sw/qa/core/makefile.mk
+index 7794dd7..3d1d2bf 100644
+--- sw/qa/core/makefile.mk
++++ sw/qa/core/makefile.mk
+@@ -73,9 +73,77 @@ DEF1NAME =$(SHL1TARGET)
+ # DEF1EXPORTFILE= export.exp
+ SHL1VERSIONMAP = export.map
+
++# 2nd test ------------------------------------------------------------------
++
++SHL2OBJS=$(SLO)$/swdoc-test.obj
++SHL2TARGET=swdoctest
++SHL2STDLIBS+= \
++ $(LNGLIB) \
++ $(CPPUNITLIB) \
++ $(SVXCORELIB) \
++ $(SVXLIB) \
++ $(SFXLIB) \
++ $(XMLOFFLIB) \
++ $(BASICLIB) \
++ $(GOODIESLIB) \
++ $(BASEGFXLIB) \
++ $(DRAWINGLAYERLIB) \
++ $(SVTOOLLIB) \
++ $(TKLIB) \
++ $(VCLLIB) \
++ $(SVLLIB) \
++ $(SOTLIB) \
++ $(UNOTOOLSLIB) \
++ $(TOOLSLIB) \
++ $(I18NISOLANGLIB) \
++ $(COMPHELPERLIB) \
++ $(UCBHELPERLIB) \
++ $(CPPUHELPERLIB) \
++ $(CPPULIB) \
++ $(VOSLIB) \
++ $(SALLIB) \
++ $(SALHELPERLIB) \
++ $(ICUUCLIB) \
++ $(I18NUTILLIB) \
++ $(VBAHELPERLIB) \
++ $(AVMEDIALIB)
++
++SHL2IMPLIB= i$(SHL2TARGET)
++DEF2NAME =$(SHL2TARGET)
++SHL2VERSIONMAP = export.map
++
++# linking statically against sw parts
++SHL2LIBS=\
++ $(SLB)$/swall.lib \
++ $(SLB)$/core1.lib \
++ $(SLB)$/core2.lib \
++ $(SLB)$/core3.lib \
++ $(SLB)$/core4.lib \
++ $(SLB)$/filter.lib \
++ $(SLB)$/ui1.lib \
++ $(SLB)$/ui2.lib
++
+ # END ------------------------------------------------------------------
+
+ # --- Targets ------------------------------------------------------
+
+ .INCLUDE : target.mk
+ .INCLUDE : _cppunit.mk
++
++# --- Fake uno bootstrap & copy testfile ------------------------
++
++$(BIN)$/sw_unittest_test.ini : makefile.mk
++ rm -f $@
++ @echo UNO_SERVICES= > $@
++ @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@
++
++# --- Enable testshl2 execution in normal build ------------------------
++
++$(MISC)$/sw_unittest_succeeded : $(SHL2TARGETN) $(BIN)$/sw_unittest_test.ini
++ @echo ----------------------------------------------------------
++ @echo - start unit test on library $(SHL2TARGETN)
++ @echo ----------------------------------------------------------
++ testshl2 -forward $(BIN)$/ $(SHL2TARGETN)
++ $(TOUCH) $@
++
++ALLTAR : $(MISC)$/sw_unittest_succeeded
+diff --git sw/qa/core/swdoc-test.cxx sw/qa/core/swdoc-test.cxx
+new file mode 100644
+index 0000000..cffb562
+--- /dev/null
++++ sw/qa/core/swdoc-test.cxx
+@@ -0,0 +1,135 @@
++/*************************************************************************
++ *
++ * OpenOffice.org - a multi-platform office productivity suite
++ *
++ * $RCSfile: $
++ *
++ * $Revision: $
++ *
++ * last change: $Author: $ $Date: $
++ *
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#include "precompiled_sw.hxx"
++
++#include <cppunit/simpleheader.hxx>
++
++#include <osl/file.hxx>
++#include <osl/process.h>
++#include <cppuhelper/compbase1.hxx>
++#include <cppuhelper/bootstrap.hxx>
++#include <cppuhelper/basemutex.hxx>
++#include <comphelper/processfactory.hxx>
++#include <vcl/svapp.hxx>
++#include <sfx2/app.hxx>
++
++#include "init.hxx"
++#include "swtypes.hxx"
++#include "../source/ui/inc/initui.hxx"
++#include "doc.hxx"
++
++using namespace ::com::sun::star;
++
++/* Implementation of Swdoc-Test class */
++
++class SwDocTest : public CppUnit::TestFixture
++{
++ uno::Reference<uno::XComponentContext> mxCtx;
++ bool mbUnoInitialized;
++
++public:
++ SwDocTest() : mxCtx(), mbUnoInitialized(false) {}
++
++ void setUp()
++ {
++ if( !mbUnoInitialized )
++ {
++ const char* pArgs( getForwardString() );
++ CPPUNIT_ASSERT_MESSAGE("Test file parameter", pArgs);
++
++ const rtl::OUString sBaseDir(
++ rtl::OUString::createFromAscii(pArgs));
++
++ // bootstrap UNO
++ try
++ {
++ ::rtl::OUString aIniUrl;
++ CPPUNIT_ASSERT_MESSAGE(
++ "Converting ini file to URL",
++ osl_getFileURLFromSystemPath(
++ (sBaseDir+rtl::OUString::createFromAscii("sw_unittest_test.ini")).pData,
++ &aIniUrl.pData ) == osl_File_E_None );
++
++ mxCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
++ CPPUNIT_ASSERT_MESSAGE("Getting component context", mxCtx.is());
++
++ uno::Reference<lang::XMultiServiceFactory> xFac(
++ mxCtx->getServiceManager(),
++ uno::UNO_QUERY_THROW);
++ comphelper::setProcessServiceFactory(xFac);
++
++ InitVCL(xFac);
++ }
++ catch( uno::Exception& )
++ {
++ CPPUNIT_ASSERT_MESSAGE("Bootstrapping UNO/UCB/VCL", false);
++ }
++
++ mbUnoInitialized = true;
++ }
++
++ _InitCore();
++ pSwResMgr = SfxApplication::CreateResManager( "sw" );
++ _InitUI();
++ }
++
++ void tearDown()
++ {
++ _FinitUI();
++ pSwResMgr = 0;
++ _FinitCore();
++ }
++
++ void randomTest()
++ {
++ SwDoc aDoc;
++
++ CPPUNIT_ASSERT_MESSAGE("SwDoc::IsRedlineOn()", !aDoc.IsRedlineOn());
++ }
++
++ CPPUNIT_TEST_SUITE(SwDocTest);
++ CPPUNIT_TEST(randomTest);
++ CPPUNIT_TEST_SUITE_END();
++
++private:
++};
++
++//#####################################
++// register test suites
++CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SwDocTest, "SwDocTest");
++
++NOADDITIONAL;
++
+diff --git sw/source/core/bastyp/init.cxx sw/source/core/bastyp/init.cxx
+index 79dc3f7..22674eb 100644
+--- sw/source/core/bastyp/init.cxx
++++ sw/source/core/bastyp/init.cxx
+@@ -754,9 +754,14 @@ void _InitCore()
+
+ pGlobalOLEExcludeList = new SvPtrarr;
+
+- const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get()->GetAutoCorrect()->GetSwFlags();
+- SwDoc::pACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
+- rAFlags.nAutoCmpltWordLen );
++ try
++ {
++ const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get()->GetAutoCorrect()->GetSwFlags();
++ SwDoc::pACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
++ rAFlags.nAutoCmpltWordLen );
++ } catch( uno::RuntimeException& )
++ {
++ }
+ }
+
+ /******************************************************************************
+@@ -861,7 +866,9 @@ CharClass& GetAppCharClass()
+
+ LocaleDataWrapper& GetAppLocaleData()
+ {
+- SvtSysLocale aSysLocale;
++ // wow. returning reference to a local object. hacked to work for
++ // now...
++ static SvtSysLocale aSysLocale;
+ return (LocaleDataWrapper&)aSysLocale.GetLocaleData();
+ }
+
+diff --git sw/source/core/bastyp/makefile.mk sw/source/core/bastyp/makefile.mk
+index 2203980..4444944 100644
+--- sw/source/core/bastyp/makefile.mk
++++ sw/source/core/bastyp/makefile.mk
+@@ -78,6 +78,7 @@ SLOFILES = \
+
+ EXCEPTIONSFILES = \
+ $(SLO)$/SwBitArray.obj \
++ $(SLO)$/init.obj \
+ $(SLO)$/tabcol.obj
+
+ # --- Tagets -------------------------------------------------------
+diff --git tools/source/rc/resmgr.cxx tools/source/rc/resmgr.cxx
+index 3610223..fec0c42 100644
+--- tools/source/rc/resmgr.cxx
++++ tools/source/rc/resmgr.cxx
+@@ -838,26 +838,6 @@ void ResMgr::RscError_Impl( const sal_Char* pMessage, ResMgr* pResMgr,
+
+ // =======================================================================
+
+-static void RscException_Impl()
+-{
+- switch ( NAMESPACE_VOS(OSignalHandler)::raise( OSL_SIGNAL_USER_RESOURCEFAILURE, (void*)"" ) )
+- {
+- case NAMESPACE_VOS(OSignalHandler)::TAction_CallNextHandler:
+- abort();
+-
+- case NAMESPACE_VOS(OSignalHandler)::TAction_Ignore:
+- return;
+-
+- case NAMESPACE_VOS(OSignalHandler)::TAction_AbortApplication:
+- abort();
+-
+- case NAMESPACE_VOS(OSignalHandler)::TAction_KillApplication:
+- exit(-1);
+- }
+-}
+-
+-// =======================================================================
+-
+ void ImpRCStack::Init( ResMgr* pMgr, const Resource* pObj, sal_uInt32 Id )
+ {
+ pResource = NULL;
+@@ -952,7 +932,6 @@ void ResMgr::Init( const OUString& rFileName )
+ aStr += ByteString( OUStringToOString( rFileName, RTL_TEXTENCODING_UTF8 ) );
+ DBG_ERROR( aStr.GetBuffer() );
+ #endif
+- RscException_Impl();
+ }
+ #ifdef DBG_UTIL
+ else
+@@ -1183,6 +1162,18 @@ BOOL ResMgr::GetResource( const ResId& rId, const Resource* pResObj )
+ pTop->pResource = (RSHEADER_TYPE *)pTop->pClassRes;
+ else
+ {
++ if( !pImpRes )
++ {
++#ifdef DBG_UTIL
++ RscError_Impl( "Cannot load resource! ",
++ this, nRT, nId, aStack, nCurStack-1 );
++#endif
++ pTop->Flags |= RC_NOTFOUND;
++ pTop->pClassRes = getEmptyBuffer();
++ pTop->pResource = (RSHEADER_TYPE*)pTop->pClassRes;
++ return FALSE;
++ }
++
+ pTop->pClassRes = pImpRes->LoadGlobalRes( nRT, nId, &pTop->aResHandle );
+ if ( pTop->pClassRes )
+ {
+@@ -1688,7 +1679,7 @@ ResMgr* ResMgr::CreateResMgr( const sal_Char* pPrefixName,
+ aLocale = ResMgrContainer::get().getDefLocale();
+
+ InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, aLocale );
+- return pImp ? new ResMgr( pImp ) : NULL;
++ return new ResMgr( pImp );
+ }
+
+ // -----------------------------------------------------------------------
+@@ -1705,7 +1696,7 @@ ResMgr* ResMgr::SearchCreateResMgr(
+ rLocale = ResMgrContainer::get().getDefLocale();
+
+ InternalResMgr* pImp = ResMgrContainer::get().getResMgr( aPrefix, rLocale );
+- return pImp ? new ResMgr( pImp ) : NULL;
++ return new ResMgr( pImp );
+ }
+
+ // -----------------------------------------------------------------------
commit 79197d5c1a27e8da71b1ef9e5f3a54af6e7af76b
Author: Thorsten Behrens <thb at openoffice.org>
Date: Tue Aug 11 16:48:49 2009 +0200
Adapted for dev300 and added more check target places
* patches/unittesting/unittesting-build-pl.diff: added dmake check
target to cppunit.mk (to give testshl2-using modules auto-unit
tests)
* patches/unittesting/unittesting-tools.diff: adapted to dev300
* patches/unittesting/unittesting-ucb.diff: adapted to dev300
diff --git a/patches/unittesting/unittesting-build-pl.diff b/patches/unittesting/unittesting-build-pl.diff
index adc7392..5e982d7 100644
--- a/patches/unittesting/unittesting-build-pl.diff
+++ b/patches/unittesting/unittesting-build-pl.diff
@@ -1,8 +1,8 @@
-diff --git solenv/bin/build.pl solenv/bin/build.pl
-index d9e862a..d4084b9 100644
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index c5cb123..6fddbf5 100755
--- solenv/bin/build.pl
+++ solenv/bin/build.pl
-@@ -196,6 +196,10 @@
+@@ -188,6 +188,10 @@
# the server considered as an error/client crash
my %lost_client_jobs = (); # hash containing lost jobs
my %job_jobdir = (); # hash containing job-dir pairs
@@ -13,7 +13,7 @@ index d9e862a..d4084b9 100644
### main ###
get_options();
-@@ -503,7 +507,11 @@ sub dmake_dir {
+@@ -494,7 +498,11 @@ sub dmake_dir {
};
RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
return if ($cmd_file || $show);
@@ -26,7 +26,7 @@ index d9e862a..d4084b9 100644
# chdir $BuildDir;
# getcwd();
# if ($html) {
-@@ -512,14 +520,14 @@ sub dmake_dir {
+@@ -503,14 +511,14 @@ sub dmake_dir {
# if (!-d $log_dir) {
# system("$perl $mkout");
# };
@@ -45,7 +45,7 @@ index d9e862a..d4084b9 100644
html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
};
if ($error_code && $ignore) {
-@@ -562,8 +570,27 @@ sub store_build_list_content {
+@@ -553,8 +561,27 @@ sub store_build_list_content {
} else {
if (open (BUILD_LST, $build_list_path)) {
my @build_lst = <BUILD_LST>;
@@ -74,7 +74,7 @@ index d9e862a..d4084b9 100644
return;
}
$dead_parents{$module}++;
-@@ -1286,6 +1313,7 @@ sub get_options {
+@@ -1278,6 +1305,7 @@ sub get_options {
push (@dmake_args, get_dmake_args()) if (!$custom_job);
next;
};
@@ -82,7 +82,7 @@ index d9e862a..d4084b9 100644
push (@dmake_args, $arg);
};
if (!$html) {
-@@ -1347,6 +1375,10 @@ sub get_dmake_args {
+@@ -1335,6 +1363,10 @@ sub get_dmake_args {
my @job_args = ();
while ($arg = shift @ARGV) {
next if ($arg =~ /^--$/);
@@ -93,11 +93,140 @@ index d9e862a..d4084b9 100644
push (@job_args, $arg);
};
return @job_args;
-diff --git solenv/inc/target.mk solenv/inc/target.mk
-index afb9580..614c10e 100644
+diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk
+index 7aab2b0..40f64ba 100644
+--- solenv/inc/_cppunit.mk
++++ solenv/inc/_cppunit.mk
+@@ -15,8 +15,8 @@ TEST1LIB=$(SHL1TARGETN)
+ .ENDIF
+
+ .IF "$(SHL1TARGET)"!=""
+-test : test1
+-test1: ALLTAR
++check : check1
++check1: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#1 on library $(TEST1LIB)
+ @echo ----------------------------------------------------------
+@@ -44,8 +44,8 @@ TEST2LIB=$(SHL2TARGETN)
+ .ENDIF
+
+ .IF "$(SHL2TARGET)"!=""
+-test : test2
+-test2: ALLTAR
++check : check2
++check2: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#2 on library $(TEST2LIB)
+ @echo ----------------------------------------------------------
+@@ -73,8 +73,8 @@ TEST3LIB=$(SHL3TARGETN)
+ .ENDIF
+
+ .IF "$(SHL3TARGET)"!=""
+-test : test3
+-test3: ALLTAR
++check : check3
++check3: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#3 on library $(TEST3LIB)
+ @echo ----------------------------------------------------------
+@@ -102,8 +102,8 @@ TEST4LIB=$(SHL4TARGETN)
+ .ENDIF
+
+ .IF "$(SHL4TARGET)"!=""
+-test : test4
+-test4: ALLTAR
++check : check4
++check4: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#4 on library $(TEST4LIB)
+ @echo ----------------------------------------------------------
+@@ -131,8 +131,8 @@ TEST5LIB=$(SHL5TARGETN)
+ .ENDIF
+
+ .IF "$(SHL5TARGET)"!=""
+-test : test5
+-test5: ALLTAR
++check : check5
++check5: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#5 on library $(TEST5LIB)
+ @echo ----------------------------------------------------------
+@@ -160,8 +160,8 @@ TEST6LIB=$(SHL6TARGETN)
+ .ENDIF
+
+ .IF "$(SHL6TARGET)"!=""
+-test : test6
+-test6: ALLTAR
++check : check6
++check6: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#6 on library $(TEST6LIB)
+ @echo ----------------------------------------------------------
+@@ -189,8 +189,8 @@ TEST7LIB=$(SHL7TARGETN)
+ .ENDIF
+
+ .IF "$(SHL7TARGET)"!=""
+-test : test7
+-test7: ALLTAR
++check : check7
++check7: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#7 on library $(TEST7LIB)
+ @echo ----------------------------------------------------------
+@@ -218,8 +218,8 @@ TEST8LIB=$(SHL8TARGETN)
+ .ENDIF
+
+ .IF "$(SHL8TARGET)"!=""
+-test : test8
+-test8: ALLTAR
++check : check8
++check8: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#8 on library $(TEST8LIB)
+ @echo ----------------------------------------------------------
+@@ -247,8 +247,8 @@ TEST9LIB=$(SHL9TARGETN)
+ .ENDIF
+
+ .IF "$(SHL9TARGET)"!=""
+-test : test9
+-test9: ALLTAR
++check : check9
++check9: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#9 on library $(TEST9LIB)
+ @echo ----------------------------------------------------------
+@@ -276,8 +276,8 @@ TEST10LIB=$(SHL10TARGETN)
+ .ENDIF
+
+ .IF "$(SHL10TARGET)"!=""
+-test : test10
+-test10: ALLTAR
++check : check10
++check10: ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#10 on library $(TEST10LIB)
+ @echo ----------------------------------------------------------
+diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
+index 3567463..89b5df5 100644
+--- solenv/inc/cppunit.mk
++++ solenv/inc/cppunit.mk
+@@ -69,8 +69,8 @@ TEST$(TNR)LIB=$(SHL$(TNR)TARGETN)
+ .ENDIF
+
+ .IF "$(SHL$(TNR)TARGET)"!=""
+-test : test$(TNR)
+-test$(TNR): ALLTAR
++check : check$(TNR)
++check$(TNR): ALLTAR
+ @echo ----------------------------------------------------------
+ @echo - start unit test \#$(TNR) on library $(TEST$(TNR)LIB)
+ @echo ----------------------------------------------------------
+diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
+index 0264ac9..231ec2e 100644
--- solenv/inc/target.mk
+++ solenv/inc/target.mk
-@@ -2080,3 +2080,10 @@ $(SUBDIRS) .PHONY :
+@@ -2109,3 +2109,10 @@ $(SUBDIRS) .PHONY :
# if the previous block was a rule or a target, "\#" isn't recognized
# as an escaped "#". if it was an assignment, escaping works...
some_unique_variable_name:=1
diff --git a/patches/unittesting/unittesting-tools.diff b/patches/unittesting/unittesting-tools.diff
index a4e9731..6adf93b 100644
--- a/patches/unittesting/unittesting-tools.diff
+++ b/patches/unittesting/unittesting-tools.diff
@@ -1,19 +1,6 @@
--- tools/prj/tests.lst 1970-01-01 01:00:00.000000000 +0100
+++ tools/prj/tests.lst 2007-09-07 14:38:11.000000000 +0200
-@@ -0,0 +1,5 @@
-+tl tools\qa\urlobj nmake - all tl_qa_urlobj tl_utl NULL
-+
+@@ -0,0 +1,3 @@
+# older tests:
+tl tools\test nmake - all tl_test tl_utl NULL
+tl tools\workben nmake - all tl_workben tl_utl NULL
---- tools/qa/urlobj/tools_urlobj_test.cxx 2007-09-06 23:05:09.000000000 +0200
-+++ tools/qa/urlobj/tools_urlobj_test.cxx 2007-09-07 16:21:20.000000000 +0200
-@@ -35,7 +35,7 @@
-
- #include <cppunit/simpleheader.hxx>
-
-- #include <urlobj.hxx>
-+ #include <tools/urlobj.hxx>
-
- namespace tools_urlobj
- {
diff --git a/patches/unittesting/unittesting-ucb.diff b/patches/unittesting/unittesting-ucb.diff
index 6b46c6d..26ccf6b 100644
--- a/patches/unittesting/unittesting-ucb.diff
+++ b/patches/unittesting/unittesting-ucb.diff
@@ -3,7 +3,7 @@ index f0eb0da..dd90fe9 100644
--- ucb/prj/build.lst
+++ ucb/prj/build.lst
@@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
+-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl tools NULL
uc ucb usr1 - all uc_mkout NULL
uc ucb\inc nmake - all uc_inc NULL
commit a7ff0f1ead8c618a96fcee940a558e71078be3a4
Author: Thorsten Behrens <thb at openoffice.org>
Date: Wed Aug 5 11:05:11 2009 +0200
Hacky tinderbox-like build loop for ooo-build
* bin/build-ooo: tweaked to generate html output
* bin/tinbuild: the build loop
diff --git a/bin/build-ooo b/bin/build-ooo
index be69c33..85fdaaf 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -112,6 +112,9 @@ fi
if test "z$BUILD_WIN32" = "z"; then
EXTRA_BUILD_FLAGS="--dlv_switch -link $EXTRA_BUILD_FLAGS"
fi
+if test "z$BUILD_HTML_OUTPUT" != "z"; then
+ EXTRA_BUILD_FLAGS="--html $EXTRA_BUILD_FLAGS"
+fi
echo "EXTRA_BUILD_FLAGS: $EXTRA_BUILD_FLAGS"
EXTRA_DMAKE_FLAGS=
diff --git a/bin/tinbuild b/bin/tinbuild
new file mode 100755
index 0000000..b1e114d
--- /dev/null
+++ b/bin/tinbuild
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export BUILD_HTML_OUTPUT=true
+
+make clean-local
+while git pull -r && ./autogen.sh && ./download && make; do make clean-local; done
More information about the ooo-build-commit
mailing list