Mercurial > octave

diff libinterp/dldfcn/__osmesa_print__.cc @ 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 1487a68a496a
children ad0599a0acc6
line wrap: on
line diff
--- 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 ();