Mercurial > octave

changeset 21511:e1c5aca1c798

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix failing tests when building with --without-opengl * graphics.cc, __osmesa_print__.cc, uimenu.m, allchild.m, findall.m, graphics_toolkit.m: Fix failing BIST tests when building with --without-opengl by adding HAVE_OPENGL to the test preconditions.
author Mike Miller <mtmiller@octave.org>
date Mon, 21 Mar 2016 15:01:12 -0700
parents ddfd7e5f8d18
children 79aa496c6d47
files libinterp/corefcn/graphics.cc libinterp/dldfcn/__osmesa_print__.cc scripts/gui/uimenu.m scripts/plot/util/allchild.m scripts/plot/util/findall.m scripts/plot/util/graphics_toolkit.m
diffstat 6 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/graphics.cc	Sun Mar 20 21:39:49 2016 +0000
+++ b/libinterp/corefcn/graphics.cc	Mon Mar 21 15:01:12 2016 -0700
@@ -4587,7 +4587,7 @@
 }
 
 /*
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! hf = figure ("visible", "off");
 %! graphics_toolkit (hf, "fltk");
 %! unwind_protect
@@ -4606,7 +4606,7 @@
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! hf = figure ("visible", "off");
 %! graphics_toolkit (hf, "fltk");
 %! fpos = get (hf, "position");
@@ -4625,7 +4625,7 @@
 %! unwind_protect_cleanup
 %!   close (hf);
 %! end_unwind_protect
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! hf = figure ("visible", "off");
 %! graphics_toolkit (hf, "fltk");
 %! fpos = get (hf, "position");
--- a/libinterp/dldfcn/__osmesa_print__.cc	Sun Mar 20 21:39:49 2016 +0000
+++ b/libinterp/dldfcn/__osmesa_print__.cc	Mon Mar 21 15:01:12 2016 -0700
@@ -206,7 +206,7 @@
 ##        This is not critical, since this facility will mostly be used in
 ##        the future for generating the images in Octave's own documentation.
 ##        For the moment, disable these tests on PC's and Macs.
-%!testif HAVE_OSMESA, HAVE_GL2PS_H
+%!testif HAVE_OPENGL, HAVE_OSMESA, HAVE_GL2PS_H
 %! if (isunix ())
 %!   h = figure ("visible", "off");
 %!   fn = tempname ();
@@ -221,7 +221,7 @@
 %!   assert (img_fp, [52942515; 54167797; 56158178], -0.05);
 %! endif
 
-%!testif HAVE_OSMESA, HAVE_GL2PS_H
+%!testif HAVE_OPENGL, HAVE_OSMESA, HAVE_GL2PS_H
 %! if (isunix ())
 %!   h = figure ("visible", "off");
 %!   fn = tempname ();
--- a/scripts/gui/uimenu.m	Sun Mar 20 21:39:49 2016 +0000
+++ b/scripts/gui/uimenu.m	Mon Mar 21 15:01:12 2016 -0700
@@ -103,7 +103,7 @@
 %! uimenu (f, 'label', 'Close', 'accelerator', 'q', 'callback', 'close (gcf)');
 %! uimenu (e, 'label', 'Toggle &Grid', 'accelerator', 'g', 'callback', 'grid (gca)');
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
@@ -120,7 +120,7 @@
 %! end_unwind_protect
 
 ## check for top level menus file and edit
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
@@ -133,7 +133,7 @@
 %!   graphics_toolkit (toolkit);
 %! end_unwind_protect
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
--- a/scripts/plot/util/allchild.m	Sun Mar 20 21:39:49 2016 +0000
+++ b/scripts/plot/util/allchild.m	Mon Mar 21 15:01:12 2016 -0700
@@ -48,7 +48,7 @@
 endfunction
 
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
--- a/scripts/plot/util/findall.m	Sun Mar 20 21:39:49 2016 +0000
+++ b/scripts/plot/util/findall.m	Mon Mar 21 15:01:12 2016 -0700
@@ -50,7 +50,7 @@
 endfunction
 
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! toolkit = graphics_toolkit ("fltk");
 %! hf = figure ("visible", "off");
 %! unwind_protect
--- a/scripts/plot/util/graphics_toolkit.m	Sun Mar 20 21:39:49 2016 +0000
+++ b/scripts/plot/util/graphics_toolkit.m	Mon Mar 21 15:01:12 2016 -0700
@@ -105,7 +105,7 @@
 endfunction
 
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! unwind_protect
 %!   hf = figure ("visible", "off");
 %!   toolkit = graphics_toolkit ();
@@ -116,7 +116,7 @@
 %!   close (hf);
 %! end_unwind_protect
 
-%!testif HAVE_FLTK
+%!testif HAVE_OPENGL, HAVE_FLTK
 %! old_toolkit = graphics_toolkit ();
 %! switch (old_toolkit)
 %!   case {"gnuplot"}