Mercurial > octave

changeset 27847:56d94f86a659

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't test presence of OSMESA which will always fail (bug #57424) * geometryimages.m, interpimages.m, plotimages.m, sparseimages.m, splineimages.m: Don't expect OSMESA to be present. * publish.tst: Ditto. Only fallback to gnuplot on Windows if Qt offscreen support is not detected and "qt" is not the chosen graphics_toolkit.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Mon, 16 Dec 2019 17:47:35 +0100
parents 4075474fd9d0
children 7a3444bdf958
files doc/interpreter/geometryimages.m doc/interpreter/interpimages.m doc/interpreter/plotimages.m doc/interpreter/sparseimages.m doc/interpreter/splineimages.m test/publish/publish.tst
diffstat 6 files changed, 11 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/geometryimages.m	Tue Dec 17 13:19:36 2019 +0900
+++ b/doc/interpreter/geometryimages.m	Mon Dec 16 17:47:35 2019 +0100
@@ -146,8 +146,7 @@
   elseif (strcmp ("qt", graphics_toolkit ())
           && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
-  elseif (! strcmp ("gnuplot", graphics_toolkit ()) ...
-          && ! __have_feature__ ("OSMESA"))
+  elseif (! strcmp ("gnuplot", graphics_toolkit ()))
     if (! any (strcmp ("gnuplot", available_graphics_toolkits ())))
       error ("no graphics toolkit available for offscreen plotting");
     else
--- a/doc/interpreter/interpimages.m	Tue Dec 17 13:19:36 2019 +0900
+++ b/doc/interpreter/interpimages.m	Mon Dec 16 17:47:35 2019 +0100
@@ -88,8 +88,7 @@
   elseif (strcmp ("qt", graphics_toolkit ())
           && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
-  elseif (! strcmp ("gnuplot", graphics_toolkit ())
-          && ! __have_feature__ ("OSMESA"))
+  elseif (! strcmp ("gnuplot", graphics_toolkit ()))
     if (! any (strcmp ("gnuplot", available_graphics_toolkits ())))
       error ("no graphics toolkit available for offscreen plotting");
     else
--- a/doc/interpreter/plotimages.m	Tue Dec 17 13:19:36 2019 +0900
+++ b/doc/interpreter/plotimages.m	Mon Dec 16 17:47:35 2019 +0100
@@ -126,8 +126,7 @@
   elseif (strcmp ("qt", graphics_toolkit ())
           && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
-  elseif (! strcmp ("gnuplot", graphics_toolkit ()) ...
-          && ! __have_feature__ ("OSMESA"))
+  elseif (! strcmp ("gnuplot", graphics_toolkit ()))
     if (! any (strcmp ("gnuplot", available_graphics_toolkits ())))
       error ("no graphics toolkit available for offscreen plotting");
     else
--- a/doc/interpreter/sparseimages.m	Tue Dec 17 13:19:36 2019 +0900
+++ b/doc/interpreter/sparseimages.m	Mon Dec 16 17:47:35 2019 +0100
@@ -247,8 +247,7 @@
   elseif (strcmp ("qt", graphics_toolkit ())
           && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
-  elseif (! strcmp ("gnuplot", graphics_toolkit ())
-          && ! __have_feature__ ("OSMESA"))
+  elseif (! strcmp ("gnuplot", graphics_toolkit ()))
     if (! any (strcmp ("gnuplot", available_graphics_toolkits ())))
       error ("no graphics toolkit available for offscreen plotting");
     else
--- a/doc/interpreter/splineimages.m	Tue Dec 17 13:19:36 2019 +0900
+++ b/doc/interpreter/splineimages.m	Mon Dec 16 17:47:35 2019 +0100
@@ -178,8 +178,7 @@
   elseif (strcmp ("qt", graphics_toolkit ())
           && __have_feature__ ("QT_OFFSCREEN"))
     ## Use qt with QOffscreenSurface for plot
-  elseif (! strcmp ("gnuplot", graphics_toolkit ())
-          && ! __have_feature__ ("OSMESA"))
+  elseif (! strcmp ("gnuplot", graphics_toolkit ()))
     if (! any (strcmp ("gnuplot", available_graphics_toolkits ())))
       error ("no graphics toolkit available for offscreen plotting");
     else
--- a/test/publish/publish.tst	Tue Dec 17 13:19:36 2019 +0900
+++ b/test/publish/publish.tst	Mon Dec 16 17:47:35 2019 +0100
@@ -22,11 +22,12 @@
 %! visibility = get (0, "defaultfigurevisible");
 %! toolkit = graphics_toolkit ();
 %! unwind_protect
-%!   if (ispc () || ! __have_feature__ ("OSMESA"))
+%!   if (! __have_feature__ ("QT_OFFSCREEN")
+%!       || ! strcmp (graphics_toolkit (), "qt"))
 %!     try
 %!       graphics_toolkit ("gnuplot");
 %!     catch
-%!       ## The system doesn't support OSMESA or gnuplot for drawing hidden
+%!       ## The system doesn't support gnuplot for drawing hidden
 %!       ## figures.  Just return and have test marked as passing.
 %!       return;
 %!     end_try_catch
@@ -53,11 +54,12 @@
 %! visibility = get (0, "defaultfigurevisible");
 %! toolkit = graphics_toolkit ();
 %! unwind_protect
-%!   if (ispc () || ! __have_feature__ ("OSMESA"))
+%!   if (! __have_feature__ ("QT_OFFSCREEN")
+%!       || ! strcmp (graphics_toolkit (), "qt"))
 %!     try
 %!       graphics_toolkit ("gnuplot");
 %!     catch
-%!       ## The system doesn't support OSMESA or gnuplot for drawing hidden
+%!       ## The system doesn't support gnuplot for drawing hidden
 %!       ## figures.  Just return and have test marked as passing.
 %!       return;
 %!     end_try_catch