Changeset 2169

Timestamp:

12/23/08 03:25:54 (3 years ago)

Author:

szabgab

Message:

skip lots of tests if there is no DISPLAY set

Location:

trunk/Padre/t

Files:

• 00-compile.t (modified) (1 diff)
• 02-new.t (modified) (1 diff)
• 03-wx.t (modified) (2 diffs)
• 60-db.t (modified) (1 diff)
• 70-document.t (modified) (1 diff)
• 71-perl.t (modified) (1 diff)
• 80-newline.t (modified) (2 diffs)
• 82-plugin-manager.t (modified) (1 diff)
• 85-task-manager.t (modified) (1 diff)
• 91-vi.t (modified) (1 diff)

trunk/Padre/t/00-compile.t

@@ -1 +1 @@
 use strict;
 use warnings;
-use Test::NeedsDisplay;
+#use Test::NeedsDisplay;
 
 use Test::More;
-plan skip_all => 'Needs DISPLAY' if
+plan skip_all => 'Needs DISPLAY' if not $ENV{DISPLAY} and not $^O eq 'MSWin32';
 plan skip_all => 'Needs Test::Compile 0.08 but that does not work on Windows' if $^O eq 'MSWin32'; # the same as File::Spec uses
 plan skip_all => 'Needs Test::Compile 0.08' if not eval "use Test::Compile 0.08; 1"; ## no critic

trunk/Padre/t/02-new.t

@@ -4 +4 @@
 use warnings;
 
-use Test::NeedsDisplay;
-use Test::More tests => 14;
+#use Test::NeedsDisplay;
+use Test::More;
+
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
+plan tests => 14;
 use Test::NoWarnings;
-
 use t::lib::Padre;
 use Padre;

trunk/Padre/t/03-wx.t

@@ -5 +5 @@
 
 use Test::More;
+
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
 
 BEGIN {
@@ -16 +24 @@
 use File::Copy            qw(copy);
 use File::Spec::Functions qw(catfile);
-use Test::NeedsDisplay;
+#use Test::NeedsDisplay;
 use Test::NoWarnings;
 use Test::Builder;

trunk/Padre/t/60-db.t

@@ -4 +4 @@
 use warnings;
 
-use Test::More tests => 20;
+use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
+plan tests => 20;
+
 use Test::NoWarnings;
 

trunk/Padre/t/70-document.t

@@ -3 +3 @@
 use strict;
 use warnings;
-use Test::NeedsDisplay;
+#use Test::NeedsDisplay;
 use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
 use Test::NoWarnings;
 use File::Spec  ();

trunk/Padre/t/71-perl.t

@@ -3 +3 @@
 use strict;
 use warnings;
-use Test::NeedsDisplay;
+#use Test::NeedsDisplay;
 use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
 use Test::NoWarnings;
 use Data::Dumper qw(Dumper);

trunk/Padre/t/80-newline.t

@@ -3 +3 @@
 use strict;
 use warnings;
-use Test::NeedsDisplay;
+#use Test::NeedsDisplay;
 
 my $CR   = "\015";
@@ -10 +10 @@
 
 use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
 use Test::NoWarnings;
 use t::lib::Padre;

trunk/Padre/t/82-plugin-manager.t

@@ -8 +8 @@
 use Data::Dumper qw(Dumper);
 
-use Test::More tests => 25;
+use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
+plan tests => 25;
+
 use Test::NoWarnings;
 

trunk/Padre/t/85-task-manager.t

@@ -8 +8 @@
 use Data::Dumper qw(Dumper);
 
-use Test::More tests => 12;
+use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
+plan tests => 12;
 
 use t::lib::Padre;

trunk/Padre/t/91-vi.t

@@ -5 +5 @@
 use Data::Dumper;
 use Test::More;
+BEGIN {
+    if (not $ENV{DISPLAY} and not $^O eq 'MSWin32') {
+        plan skip_all => 'Needs DISPLAY';
+        exit 0;
+    }
+}
+
 use Test::NoWarnings;
 my $tests;