Changeset 2641
- Timestamp:
- 06/25/08 08:02:09 (20 months ago)
- Files:
-
- 1 modified
-
branches/release-40/t/09-image.t (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/release-40/t/09-image.t
r2562 r2641 16 16 use MT; 17 17 18 use vars qw( $BASE @Img @drivers ); 19 20 require 't/test-common.pl'; 18 use vars qw( @Img @drivers ); 21 19 22 20 BEGIN { … … 25 23 [ 'test.jpg', 640, 480 ], 26 24 ); 27 @drivers = qw( ImageMagick NetPBM );25 @drivers = qw( ImageMagick NetPBM GD ); 28 26 plan tests => scalar @Img # file exists 29 + (scalar @Img * scalar @drivers * 1 8) # 18tests each for every image and driver27 + (scalar @Img * scalar @drivers * 19) # 19 tests each for every image and driver 30 28 ; 31 29 } … … 38 36 39 37 my $cfg = MT::ConfigMgr->instance; 40 $cfg->NetPBMPath($netpbm) if -x $netpbm; 38 if (!$cfg->NetPBMPath) { 39 $cfg->NetPBMPath($netpbm) if -x $netpbm; 40 } 41 41 42 42 for my $rec (@Img) { 43 43 my ($img_filename, $img_width, $img_height) = @$rec; 44 my $img_file = File::Spec->catfile($ BASE, 't', 'images', $img_filename);44 my $img_file = File::Spec->catfile($ENV{MT_HOME}, 't', 'images', $img_filename); 45 45 ok(-B $img_file, "$img_file looks like a binary file"); 46 46 … … 49 49 my $img = MT::Image->new( Filename => $img_file ); 50 50 SKIP : { 51 skip("no $driver image", 1 8) unless $img;51 skip("no $driver image", 19) unless $img; 52 52 isa_ok($img, 'MT::Image::' . $driver, "driver $driver with image $img_file is an MT::Image::$driver"); 53 53 # diag( MT::Image->errstr ) if MT::Image->errstr;
