diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-09-14 08:09:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-16 11:39:47 +0200 |
| commit | 6eb840cc540bb6f2efcebc0349a8e6e7ba074cd8 (patch) | |
| tree | 4655c4751fcb9541e5b63addcb1ec30b51727c3a /cppuhelper | |
| parent | 429042021590c80afb25ade833269635a24f2778 (diff) | |
Set URE_INTERNAL_JAVA_DIR for unorc to allow jvm in unit tests.
Currently unit tests run in solver, the unorc in solver is simply
copied from cppuhelper/source/unorc, which doesn't set
URE_INTERNAL_JAVA_DIR, hence the jvm cannot be loaded in Unit tests.
(For comparison the URE unorc in instdir is copied from ure/source/uno{rc,.ini}
and contains the appropriate java paths.)
(URE_INTERNAL_JAVA_CLASSPATH is not needed, at least currently.)
Change-Id: I5911c9a22c92e0e20c98d0e51d5b14e020c8ec10
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, slightly modified
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/unorc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cppuhelper/source/unorc b/cppuhelper/source/unorc index d6bf69679ffd..48c8b0c98aab 100644 --- a/cppuhelper/source/unorc +++ b/cppuhelper/source/unorc @@ -18,5 +18,6 @@ [Bootstrap] URE_INTERNAL_LIB_DIR=${ORIGIN} +URE_INTERNAL_JAVA_DIR=${ORIGIN}/../bin UNO_SERVICES=${URE_MORE_SERVICES} UNO_TYPES=${ORIGIN}/../bin/udkapi.rdb ${URE_MORE_TYPES} |