[Libreoffice-commits] .: testtools/source

[Libreoffice Gerrit user]

 testtools/source/performance/ubtest.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bfa5cb86a9737ad97e068fd9d1ea40397d2ac3f
Author: Julien Nabet 
Date:   Sun Sep 16 10:24:59 2012 +0200

Fix duplicate branches for if and else

Change-Id: Ic602fd4df63e6807f49c256ce7849ae587eeb82d

diff --git a/testtools/source/performance/ubtest.cxx 
b/testtools/source/performance/ubtest.cxx
index a8ca0e0..356fd6d 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -1035,7 +1035,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & 
rArgs )
 out( " log=" );
 if (stream == stderr)
 out( "stderr" );
-else if (stream == stderr)
+else if (stream == stdout)
 out( "stdout loop=" );
 else
 out( aLogStr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice] [Libreoffice-commits] .: testtools/source

[Jan Holesovsky]

Hi Stephan,

On 2011-11-17 at 08:53 +0100, Stephan Bergmann wrote:

> >  Revert the component.map removal from makefile to fix Windows build.
> 
> Can somebody with a working Windows build try out whether adding lines
> 
>SHL1IMPLIB = i$(SHL1TARGET)
>SHL2IMPLIB = i$(SHL2TARGET)
> 
> would allow to revert the revert and keep Windows happy (it would at 
> least not break the Linux build)?

Does not seem to have helped, unfortunately :-( - still breaks even with
SHL1IMPLIB (having SHL1USE_EXPORT=name).  Unfortunately I'm not
motivated enough to try to debug that - if I had to spend the energy
there, I'd prefer to gbuildize the entire testtools module ;-)

Regards,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice] [Libreoffice-commits] .: testtools/source

[Stephan Bergmann]

On 11/17/2011 12:38 AM, Jan Holesovsky wrote:

  testtools/source/bridgetest/makefile.mk |4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f11d0aa461537efa2705e7b49bc2c828a700e43
Author: Jan Holesovsky
Date:   Wed Nov 16 22:57:28 2011 +0100

 Revert the component.map removal from makefile to fix Windows build.


Can somebody with a working Windows build try out whether adding lines

  SHL1IMPLIB = i$(SHL1TARGET)
  SHL2IMPLIB = i$(SHL2TARGET)

would allow to revert the revert and keep Windows happy (it would at 
least not break the Linux build)?  I'm actually not really sure, because 
these libs are built differently than others (via LIBnTARGETs, probably 
because they share common objects), but in other cases that use 
SHLnUSE_EXPORTS=name, a SHLnIMPLIB was necessary for some reason or 
other (that I cannot remember; I always use configmgr/source/makefile.mk 
as a blueprint for building a dmake-based UNO component with 
visibility---I once tweaked that one with Ause until it was exactly 
what's needed, without any obsolete cruft).


Stephan


diff --git a/testtools/source/bridgetest/makefile.mk 
b/testtools/source/bridgetest/makefile.mk
index cc3661a..31c5b7e 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -88,7 +88,7 @@ SHL1STDLIBS= \
  SHL1LIBS= $(LIB1TARGET)
  SHL1DEF=  $(MISC)$/$(SHL1TARGET).def
  DEF1NAME= $(SHL1TARGET)
-SHL1USE_EXPORTS = name
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map

  #  test object 

@@ -107,7 +107,7 @@ SHL2STDLIBS= \
  SHL2LIBS= $(LIB2TARGET)
  SHL2DEF=  $(MISC)$/$(SHL2TARGET).def
  DEF2NAME= $(SHL2TARGET)
-SHL2USE_EXPORTS = name
+SHL2VERSIONMAP = $(SOLARENV)/src/component.map

  SHL3TARGET = constructors.uno
  SHL3OBJS = $(SLO)$/constructors.obj

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice