diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-04-23 14:18:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-04-23 14:18:24 +0200 |
| commit | 85c2f280ef21780de8aa2aa3c35148afc38f70b7 (patch) | |
| tree | 55308302a9dee34c8c08566ea1fee0a15d28a456 /testtools | |
| parent | 40813789450f4e7aa506a191a2d1360c2b077d89 (diff) | |
Revert "i hope this is fixed now"
This reverts commit b8044cb828af149a4598b35a4d46d8fe4205ae74.
84dbc4fe2547f8fc341a46d7f000e721c81e63ee fixed the bridge for PPC on Linux, not
Mac OS X.
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index f87327e392d5..3e31ba6f8eb4 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -146,11 +146,15 @@ ALLTAR: \ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) .IF "$(CROSS_COMPILING)"!="YES" +.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" + @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me." +.ELSE cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \ -ro uno_services.rdb -ro uno_types.rdb \ -s com.sun.star.test.bridge.BridgeTest -- \ com.sun.star.test.bridge.CppTestObject .ENDIF +.ENDIF $(DLLDEST)/services.rdb : $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@ |