diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-10-08 09:50:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-10-08 09:50:14 +0000 |
| commit | d5c2cf42ec4f20ffebb7832f572af7f225ef4ec8 (patch) | |
| tree | 69e449fcea9e7b620893b31caad43187118a4b08 /testtools | |
| parent | 5c17aa5d92adb494fa5278c82aae0e88f5c38487 (diff) | |
#i105678# make testtools bridge-test work again after lib and path changes
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 8 | ||||
| -rw-r--r-- | testtools/source/bridgetest/pyuno/makefile.mk | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 3dfb18c7dd4d..6c475fd8ee3c 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -154,7 +154,7 @@ $(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb $(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk .IF "$(USE_SHELL)" == "bash" - echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \ + echo '$(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 > $@ .ELSE @@ -164,7 +164,7 @@ $(DLLDEST)$/bridgetest_inprocess$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk .IF "$(USE_SHELL)" == "bash" - echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \ + echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \ -s com.sun.star.test.bridge.BridgeTest -- \ -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' > $@ .ELSE @@ -174,7 +174,7 @@ $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk $(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk .IF "$(USE_SHELL)" == "bash" - echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \ + echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \ -s com.sun.star.test.bridge.CppTestObject \ -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' --singleaccept \ > $@ @@ -201,7 +201,7 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk .IF "$(USE_SHELL)" == "bash" - echo '$(AUGMENT_LIBRARY_PATH)' uno -ro uno_services.rdb -ro uno_types.rdb \ + echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \ -s com.sun.star.test.bridge.BridgeTest \ -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \ -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@ diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk index 44b9f98603b7..4ee8768ff466 100644 --- a/testtools/source/bridgetest/pyuno/makefile.mk +++ b/testtools/source/bridgetest/pyuno/makefile.mk @@ -50,8 +50,12 @@ DOLLAR_SIGN=\$$ DOLLAR_SIGN=$$ .ENDIF -#these are temporary -PYTHON=$(WRAPCMD) python +.IF "$(SYSTEM_PYTHON)"!="YES" +PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/python +.ELSE # "$(SYSTEM_LIBXSLT)"!="YES" +PYTHON=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) python +.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" + .IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2" .IF "$(USE_SHELL)"=="bash" |