diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-26 17:43:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-26 17:47:19 +0200 |
| commit | 094cf7caf9659be5a0325048fa8a164e22de1fc9 (patch) | |
| tree | c4bfeafbe139e66df6d9de75b816d29f29de06e2 /testtools | |
| parent | cedaaf89d7d9c2e41650dcc4df07b2be24649826 (diff) | |
Fix delivery of jvmfwk ini/data files
...that are (also) used during the build (e.g., cd testtools/*/lib &&
./bridgetest_inprocess_java). Broken by gbuild'ification of jvmfwk.
Diffstat (limited to 'testtools')
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 142319085936..3e31ba6f8eb4 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -195,9 +195,9 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk $(GIVE_EXEC_RIGHTS) $@ $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk - echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro services.rdb \ - -ro uno_services.rdb -ro uno_types.rdb \ - -s com.sun.star.test.bridge.BridgeTest \ + echo '$(AUGMENT_LIBRARY_PATH)' JAVA_HOME='$(JAVA_HOME)' \ + '$(SOLARBINDIR)'/uno -ro services.rdb -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) \ -env:MY_CLASSDIR_URL=$(MY_LOCAL_CLASSDIR) \ -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@ |