Mercurial > octave
changeset 28169:d5dfbd5c80d6
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 22 Mar 2020 17:58:36 +0100 |
parents | 925fe981a25c (current diff) b3bd3385d07a (diff) |
children | 5e49ba5bdcc1 |
files | |
diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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