# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1584896316 -3600
# Node ID d5dfbd5c80d6f9d0ed8a8ca96f7d6f81ddd23ba0
# Parent  925fe981a25c11e2d7e31a9977aa76648731fd8d# Parent  b3bd3385d07a79d787839e7cca814ed0c979e83b
maint: merge stable to default.

diff -r 925fe981a25c -r d5dfbd5c80d6 scripts/java/javaaddpath.m
--- a/scripts/java/javaaddpath.m	Sat Mar 21 20:04:02 2020 -0700
+++ b/scripts/java/javaaddpath.m	Sun Mar 22 17:58:36 2020 +0100
@@ -105,7 +105,7 @@
 ##        been added to the Java class path.
 
 ## Basic prepend test with single string
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth = tempdir ();
 %! unwind_protect
 %!   clspth1 = javaclasspath ("-dynamic");
@@ -118,7 +118,7 @@
 %! end_unwind_protect
 
 ## Prepend test with two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect
@@ -133,7 +133,7 @@
 %! end_unwind_protect
 
 ## Prepend test with cell array of two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect
@@ -148,7 +148,7 @@
 %! end_unwind_protect
 
 ## Append test with two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect
@@ -163,7 +163,7 @@
 %! end_unwind_protect
 
 ## Append test with cell array of two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect
diff -r 925fe981a25c -r d5dfbd5c80d6 scripts/java/javarmpath.m
--- a/scripts/java/javarmpath.m	Sat Mar 21 20:04:02 2020 -0700
+++ b/scripts/java/javarmpath.m	Sun Mar 22 17:58:36 2020 +0100
@@ -78,7 +78,7 @@
 ##        been added to the Java class path.
 
 ## Basic test with single string
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth = tempdir ();
 %! unwind_protect
 %!   javaaddpath (pth);
@@ -92,7 +92,7 @@
 %! end_unwind_protect
 
 ## Remove two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect
@@ -107,7 +107,7 @@
 %! end_unwind_protect
 
 ## Remove cell array of two strings
-%!testif HAVE_JAVA
+%!testif HAVE_JAVA; usejava ("jvm")
 %! pth1 = tempdir ();
 %! pth2 = tilde_expand ("~");
 %! unwind_protect