Mercurial > octave
changeset 28033:367ab44d18c8
* javaaddpath.m, javarmpath.m: Make tests conditional on HAVE_JAVA.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sat, 01 Feb 2020 10:57:35 +0100 |
parents | ef9a4e056c78 |
children | 673fb7081ebe |
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 Fri Jan 31 09:38:47 2020 -0500 +++ b/scripts/java/javaaddpath.m Sat Feb 01 10:57:35 2020 +0100 @@ -105,7 +105,7 @@ ## been added to the Java class path. ## Basic prepend test with single string -%!test +%!testif HAVE_JAVA %! pth = tempdir (); %! unwind_protect %! clspth1 = javaclasspath ("-dynamic"); @@ -118,7 +118,7 @@ %! end_unwind_protect ## Prepend test with two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect @@ -133,7 +133,7 @@ %! end_unwind_protect ## Prepend test with cell array of two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect @@ -148,7 +148,7 @@ %! end_unwind_protect ## Append test with two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect @@ -163,7 +163,7 @@ %! end_unwind_protect ## Append test with cell array of two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect
--- a/scripts/java/javarmpath.m Fri Jan 31 09:38:47 2020 -0500 +++ b/scripts/java/javarmpath.m Sat Feb 01 10:57:35 2020 +0100 @@ -78,7 +78,7 @@ ## been added to the Java class path. ## Basic test with single string -%!test +%!testif HAVE_JAVA %! pth = tempdir (); %! unwind_protect %! javaaddpath (pth); @@ -92,7 +92,7 @@ %! end_unwind_protect ## Remove two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect @@ -107,7 +107,7 @@ %! end_unwind_protect ## Remove cell array of two strings -%!test +%!testif HAVE_JAVA %! pth1 = tempdir (); %! pth2 = tilde_expand ("~"); %! unwind_protect