Clean up t/opengl.t for testing

Simplifying the test to check if the modules can load. The dynamic window creation tests were convoluted and were not being skipped correctly which causes false fails for various platforms.
PDLPorters · Oct 7, 2015 · e9f4dc3 · e9f4dc3
1 parent 2038857
commit e9f4dc3
Showing 1 changed file with 4 additions and 44 deletions.
diff --git a/t/opengl.t b/t/opengl.t
@@ -20,19 +20,9 @@ BEGIN {
    use PDL::Config;
    if ( $PDL::Config{WITH_3D} ) {  # check if compiled
       if ( $PDL::Config{USE_POGL} ) {  # check if using Perl OpenGL
-         if ( hasDISPLAY or exists($ENV{'PDL_INT'}) ) {
-            if ( $ENV{AUTOMATED_TESTING} or $ENV{CI_TESTING} ) {
-               plan tests => 2;
-            } else {
-               plan tests => 4;
-            }
-            use_ok("OpenGL $PDL::Config{POGL_VERSION}", qw(:all));
-            use_ok('PDL::Graphics::OpenGL::Perl::OpenGL');
-         } else {  # no DISPLAY
-            plan tests => 2;
-            use_ok("OpenGL $PDL::Config{POGL_VERSION}", qw(:all));
-            use_ok('PDL::Graphics::OpenGL::Perl::OpenGL');
-         }
+         plan tests => 2;
+         use_ok("OpenGL $PDL::Config{POGL_VERSION}", qw(:all));
+         use_ok('PDL::Graphics::OpenGL::Perl::OpenGL');
       } else {
          plan skip_all => 'Non-POGL TriD graphics not supported';
       }
@@ -42,35 +32,5 @@ BEGIN {
 }
 
 #
-# Try opening 2 GL windows
+# TODO: add runtime tests
 #
-
-SKIP: {
-
-   if ( hasDISPLAY and OpenGL::_have_glx ) {
-      eval  { OpenGL::glpDisplay($ENV{DISPLAY}) };
-      skip "can't open X display", 2 if $@;
-   } elsif ( $ENV{AUTOMATED_TESTING} or $ENV{CI_TESTING} ) {
-      skip "don't open try GL windows if \$AUTOMATED_TESTING or \$CI_TESTING is set", 2;
-   } else {
-
-      my $numwins = 2;
-      my @windows;
-      my $opt;
-      $opt->{width} = 90;
-      $opt->{height} = 90;
-
-      foreach(0..$numwins-1){
-         $opt->{x} = ($numwins % 10) *100;
-         $opt->{y} = int($numwins / 10) *100;
-         my $win=eval 'PDL::Graphics::OpenGL::OO->new($opt)';
-         if (! defined($win) ) {
-            skip "$@", 2 if $@ =~ /display mode not possible/;
-         } else {
-            isa_ok($win, 'PDL::Graphics::OpenGL::OO');
-         }
-         push @windows, $win;
-      }
-
-   }
-}