Mercurial > octave
changeset 28168:b3bd3385d07a stable
* javaaddpath.m, javarmpath.m: Skip BISTs if Java is unavailable on run-time.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 22 Mar 2020 17:57:50 +0100 |
parents | a0492ac068f2 |
children | d5dfbd5c80d6 65ddd575a5f5 |
files | scripts/java/javaaddpath.m scripts/java/javarmpath.m |
diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/java/javaaddpath.m Wed Mar 18 17:24:04 2020 -0400 +++ b/scripts/java/javaaddpath.m Sun Mar 22 17:57:50 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 Wed Mar 18 17:24:04 2020 -0400 +++ b/scripts/java/javarmpath.m Sun Mar 22 17:57:50 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