File Class-MOP-1.11-Build_n_Test.patch of Package perl-Class-MOP

diff -ruN Class-MOP-1.11-orig/t/000_load.t Class-MOP-1.11/t/000_load.t
--- Class-MOP-1.11-orig/t/000_load.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/000_load.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 BEGIN {
     use_ok('Class::MOP');
@@ -150,4 +150,4 @@
 
 isa_ok(Class::MOP::Class->meta, 'Class::MOP::Class');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/001_basic.t Class-MOP-1.11/t/001_basic.t
--- Class-MOP-1.11-orig/t/001_basic.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/001_basic.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -77,4 +77,4 @@
     [ 'Baz', 'Bar', 'Foo', 'UNIVERSAL' ],
     '... Baz->class_precedence_list == (Baz, Bar, Foo, UNIVERSAL)');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/002_class_precedence_list.t Class-MOP-1.11/t/002_class_precedence_list.t
--- Class-MOP-1.11-orig/t/002_class_precedence_list.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/002_class_precedence_list.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 use Class::MOP::Class;
@@ -157,4 +157,4 @@
     [ @CLASS_PRECEDENCE_LIST ],
     '... Foo::Bar::Baz->meta->class_precedence_list == @CLASS_PRECEDENCE_LIST');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/003_methods.t Class-MOP-1.11/t/003_methods.t
--- Class-MOP-1.11-orig/t/003_methods.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/003_methods.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util qw/reftype/;
@@ -380,4 +380,4 @@
 );
 
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/004_advanced_methods.t Class-MOP-1.11/t/004_advanced_methods.t
--- Class-MOP-1.11-orig/t/004_advanced_methods.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/004_advanced_methods.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -150,4 +150,4 @@
     ],
     '... got the right list of BUILD methods for Foo::Bar::Baz');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/005_attributes.t Class-MOP-1.11/t/005_attributes.t
--- Class-MOP-1.11-orig/t/005_attributes.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/005_attributes.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -259,4 +259,4 @@
   Buzz->meta->make_immutable();
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/006_new_and_clone_metaclasses.t Class-MOP-1.11/t/006_new_and_clone_metaclasses.t
--- Class-MOP-1.11-orig/t/006_new_and_clone_metaclasses.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/006_new_and_clone_metaclasses.t	2010-11-11 22:57:51.000000000 +0100
@@ -4,7 +4,7 @@
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -124,4 +124,4 @@
    $attr_clone->associated_class,
    '... we successfully did not clone our associated metaclass');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/010_self_introspection.t Class-MOP-1.11/t/010_self_introspection.t
--- Class-MOP-1.11-orig/t/010_self_introspection.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/010_self_introspection.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -351,4 +351,4 @@
 is($class_mop_class_meta->method_metaclass, 'Class::MOP::Method', '... got the right value for method_metaclass');
 is($class_mop_class_meta->instance_metaclass, 'Class::MOP::Instance', '... got the right value for instance_metaclass');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/011_create_class.t Class-MOP-1.11/t/011_create_class.t
--- Class-MOP-1.11-orig/t/011_create_class.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/011_create_class.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -110,4 +110,4 @@
 
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/012_package_variables.t Class-MOP-1.11/t/012_package_variables.t
--- Class-MOP-1.11-orig/t/012_package_variables.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/012_package_variables.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -227,4 +227,4 @@
     ok(defined(*{"Foo::foo"}{ARRAY}), '... the @foo slot has NOT been removed');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/013_add_attribute_alternate.t Class-MOP-1.11/t/013_add_attribute_alternate.t
--- Class-MOP-1.11-orig/t/013_add_attribute_alternate.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/013_add_attribute_alternate.t	2010-11-11 22:57:50.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -106,4 +106,4 @@
 
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/014_attribute_introspection.t Class-MOP-1.11/t/014_attribute_introspection.t
--- Class-MOP-1.11-orig/t/014_attribute_introspection.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/014_attribute_introspection.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -125,4 +125,4 @@
     # bored I will do it.
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/015_metaclass_inheritance.t Class-MOP-1.11/t/015_metaclass_inheritance.t
--- Class-MOP-1.11-orig/t/015_metaclass_inheritance.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/015_metaclass_inheritance.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -42,4 +42,4 @@
 isnt($baz_meta, $bar_meta, '... Baz->meta != Bar->meta');
 isnt($baz_meta, $foo_meta, '... Baz->meta != Foo->meta');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/016_class_errors_and_edge_cases.t Class-MOP-1.11/t/016_class_errors_and_edge_cases.t
--- Class-MOP-1.11-orig/t/016_class_errors_and_edge_cases.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/016_class_errors_and_edge_cases.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -220,4 +220,4 @@
     }, undef, '... remove_package_symbol dies as expected' );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/017_add_method_modifier.t Class-MOP-1.11/t/017_add_method_modifier.t
--- Class-MOP-1.11-orig/t/017_add_method_modifier.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/017_add_method_modifier.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -132,4 +132,4 @@
 is( $savings_account->balance, 200,
     '... got the right savings balance after overdraft withdrawal' );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/018_anon_class.t Class-MOP-1.11/t/018_anon_class.t
--- Class-MOP-1.11-orig/t/018_anon_class.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/018_anon_class.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -65,4 +65,4 @@
 ok(!$instance_2->isa('Foo'), '... but the new instance is not a Foo');
 ok(!$instance_2->can('foo'), '... and it can no longer call the foo method');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/019_anon_class_keep_alive.t Class-MOP-1.11/t/019_anon_class_keep_alive.t
--- Class-MOP-1.11-orig/t/019_anon_class_keep_alive.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/019_anon_class_keep_alive.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -51,4 +51,4 @@
           '... Anonymous instance has class precedence list',
          );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/020_attribute.t Class-MOP-1.11/t/020_attribute.t
--- Class-MOP-1.11-orig/t/020_attribute.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/020_attribute.t	2010-11-11 22:57:51.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Scalar::Util 'reftype', 'blessed';
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -245,4 +245,4 @@
     is($attr->default(42), 42, 'passthrough for default on attribute');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/021_attribute_errors_and_edge_cases.t Class-MOP-1.11/t/021_attribute_errors_and_edge_cases.t
--- Class-MOP-1.11-orig/t/021_attribute_errors_and_edge_cases.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/021_attribute_errors_and_edge_cases.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -229,4 +229,4 @@
     }, undef, '... can create accessors with reader/writers' );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/022_attribute_duplication.t Class-MOP-1.11/t/022_attribute_duplication.t
--- Class-MOP-1.11-orig/t/022_attribute_duplication.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/022_attribute_duplication.t	2010-11-11 22:57:54.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Scalar::Util;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -55,4 +55,4 @@
     ::is($bar_attr2->reader, 'assign_bar', '... the bar attribute now has the reader assign_bar');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/023_attribute_get_read_write.t Class-MOP-1.11/t/023_attribute_get_read_write.t
--- Class-MOP-1.11-orig/t/023_attribute_get_read_write.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/023_attribute_get_read_write.t	2010-11-11 22:57:51.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Scalar::Util 'blessed', 'reftype';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -111,4 +111,4 @@
     is($writer->fully_qualified_name, 'Foo::__ANON__', '... it is the sub we are looking for');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/024_attribute_initializer.t Class-MOP-1.11/t/024_attribute_initializer.t
--- Class-MOP-1.11-orig/t/024_attribute_initializer.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/024_attribute_initializer.t	2010-11-11 22:57:52.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Scalar::Util 'blessed', 'reftype';
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -49,4 +49,4 @@
 ok($bar->has_initializer, '... bar has an initializer');
 is(reftype $bar->initializer, 'CODE', '... the initializer is a CODE ref');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/025_attribute_non_alpha_name.t Class-MOP-1.11/t/025_attribute_non_alpha_name.t
--- Class-MOP-1.11-orig/t/025_attribute_non_alpha_name.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/025_attribute_non_alpha_name.t	2010-11-11 22:57:52.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Class::MOP;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -31,4 +31,4 @@
         unless $meta->is_immutable;
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/030_method.t Class-MOP-1.11/t/030_method.t
--- Class-MOP-1.11-orig/t/030_method.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/030_method.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -146,4 +146,4 @@
 my $wrapped2 = Method::Subclass->wrap($method, foo => 'baz', name => 'FOO');
 is($wrapped2->name, 'FOO', 'got a new method name');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/031_method_modifiers.t Class-MOP-1.11/t/031_method_modifiers.t
--- Class-MOP-1.11-orig/t/031_method_modifiers.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/031_method_modifiers.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -200,4 +200,4 @@
                'check around_modifiers' );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/032_universal_methods.t Class-MOP-1.11/t/032_universal_methods.t
--- Class-MOP-1.11-orig/t/032_universal_methods.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/032_universal_methods.t	2010-11-11 22:57:54.000000000 +0100
@@ -5,7 +5,7 @@
 
 # UNIVERSAL methods
 
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my $meta_class = Class::MOP::Class->create_anon_class;
@@ -21,4 +21,4 @@
     }
 };
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/040_metaclass.t Class-MOP-1.11/t/040_metaclass.t
--- Class-MOP-1.11-orig/t/040_metaclass.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/040_metaclass.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -55,4 +55,4 @@
 };
 ok($@, '... metaclasses must be subclass of Class::MOP::Class');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/041_metaclass_incompatibility.t Class-MOP-1.11/t/041_metaclass_incompatibility.t
--- Class-MOP-1.11-orig/t/041_metaclass_incompatibility.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/041_metaclass_incompatibility.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use metaclass;
@@ -253,4 +253,4 @@
 is(Weird::Class::Sub->meta->destructor_class, 'Weird::Meta::Method::Destructor',
    "got the right destructor class");
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/042_metaclass_incompatibility_dyn.t Class-MOP-1.11/t/042_metaclass_incompatibility_dyn.t
--- Class-MOP-1.11-orig/t/042_metaclass_incompatibility_dyn.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/042_metaclass_incompatibility_dyn.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/043_instance_metaclass_incompat.t Class-MOP-1.11/t/043_instance_metaclass_incompat.t
--- Class-MOP-1.11-orig/t/043_instance_metaclass_incompat.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/043_instance_metaclass_incompat.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/044_instance_metaclass_incompat_dyn.t Class-MOP-1.11/t/044_instance_metaclass_incompat_dyn.t
--- Class-MOP-1.11-orig/t/044_instance_metaclass_incompat_dyn.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/044_instance_metaclass_incompat_dyn.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use metaclass;
 
@@ -63,4 +63,4 @@
 };
 ok(!$@, '... FooBar2.meta => FooBar::Meta is compatible') || diag $@;
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/045_metaclass_loads_classes.t Class-MOP-1.11/t/045_metaclass_loads_classes.t
--- Class-MOP-1.11-orig/t/045_metaclass_loads_classes.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/045_metaclass_loads_classes.t	2010-11-11 22:57:54.000000000 +0100
@@ -4,7 +4,7 @@
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -38,4 +38,4 @@
 is($meta->method_metaclass,    'MyMetaClass::Method',  '... Correct method metaclass');
 ok(Class::MOP::is_class_loaded('MyMetaClass::Method'), '... method metaclass loaded');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/046_rebless_instance.t Class-MOP-1.11/t/046_rebless_instance.t
--- Class-MOP-1.11-orig/t/046_rebless_instance.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/046_rebless_instance.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util 'blessed';
 
@@ -92,4 +92,4 @@
 
 is(blessed($bar->meta->new_object), 'Parent', 'new_object gives a Parent');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/047_rebless_with_extra_params.t Class-MOP-1.11/t/047_rebless_with_extra_params.t
--- Class-MOP-1.11-orig/t/047_rebless_with_extra_params.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/047_rebless_with_extra_params.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -92,4 +92,4 @@
     ok(!exists($foo->{baz}), '... and the baz attribute was deinitialized');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/048_anon_class_create_init.t Class-MOP-1.11/t/048_anon_class_create_init.t
--- Class-MOP-1.11-orig/t/048_anon_class_create_init.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/048_anon_class_create_init.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -147,4 +147,4 @@
     ok(!$meta, "weak class is collected once instances go away");
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/049_metaclass_reinitialize.t Class-MOP-1.11/t/049_metaclass_reinitialize.t
--- Class-MOP-1.11-orig/t/049_metaclass_reinitialize.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/049_metaclass_reinitialize.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 {
@@ -202,4 +202,4 @@
 can_ok($meta->get_attribute('bar'), 'oof');
 is($meta->get_attribute('bar')->oof, 'TSET');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/050_scala_style_mixin_composition.t Class-MOP-1.11/t/050_scala_style_mixin_composition.t
--- Class-MOP-1.11-orig/t/050_scala_style_mixin_composition.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/050_scala_style_mixin_composition.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'SUPER' => 1.10, # skip all if not installed
@@ -170,4 +170,4 @@
    'x = 1, y = 2, z = 3, col = blue',
    '... got the right toString method');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/060_instance.t Class-MOP-1.11/t/060_instance.t
--- Class-MOP-1.11-orig/t/060_instance.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/060_instance.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util qw/isweak reftype/;
@@ -136,4 +136,4 @@
 
 ok(!defined($mi_foo->get_slot_value( $i_foo, "moosen" )), "... no value for slot");
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/061_instance_inline.t Class-MOP-1.11/t/061_instance_inline.t
--- Class-MOP-1.11-orig/t/061_instance_inline.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/061_instance_inline.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP::Instance;
@@ -45,4 +45,4 @@
       '... got the right code for rebless_instance_structure');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/062_custom_instance.t Class-MOP-1.11/t/062_custom_instance.t
--- Class-MOP-1.11-orig/t/062_custom_instance.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/062_custom_instance.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -135,4 +135,4 @@
     }
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/070_immutable_metaclass.t Class-MOP-1.11/t/070_immutable_metaclass.t
--- Class-MOP-1.11-orig/t/070_immutable_metaclass.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/070_immutable_metaclass.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -289,4 +289,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/071_immutable_w_custom_metaclass.t Class-MOP-1.11/t/071_immutable_w_custom_metaclass.t
--- Class-MOP-1.11-orig/t/071_immutable_w_custom_metaclass.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/071_immutable_w_custom_metaclass.t	2010-11-11 22:57:53.000000000 +0100
@@ -4,7 +4,7 @@
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Scalar::Util;
 
@@ -71,4 +71,4 @@
     ok( $meta->is_mutable, '... Baz is mutable again' );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/072_immutable_w_constructors.t Class-MOP-1.11/t/072_immutable_w_constructors.t
--- Class-MOP-1.11-orig/t/072_immutable_w_constructors.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/072_immutable_w_constructors.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -298,4 +298,4 @@
 
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/073_make_mutable.t Class-MOP-1.11/t/073_make_mutable.t
--- Class-MOP-1.11-orig/t/073_make_mutable.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/073_make_mutable.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Scalar::Util;
@@ -217,4 +217,4 @@
     Bar->meta->make_mutable;
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/074_immutable_custom_trait.t Class-MOP-1.11/t/074_immutable_custom_trait.t
--- Class-MOP-1.11-orig/t/074_immutable_custom_trait.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/074_immutable_custom_trait.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -73,4 +73,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/080_meta_package.t Class-MOP-1.11/t/080_meta_package.t
--- Class-MOP-1.11-orig/t/080_meta_package.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/080_meta_package.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -277,4 +277,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/081_meta_package_extension.t Class-MOP-1.11/t/081_meta_package_extension.t
--- Class-MOP-1.11-orig/t/081_meta_package_extension.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/081_meta_package_extension.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -92,4 +92,4 @@
 
 ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/082_get_code_info.t Class-MOP-1.11/t/082_get_code_info.t
--- Class-MOP-1.11-orig/t/082_get_code_info.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/082_get_code_info.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Sub::Name 'subname';
 
 BEGIN {
@@ -49,4 +49,4 @@
     sub foo : Bar {}
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/083_load_class.t Class-MOP-1.11/t/083_load_class.t
--- Class-MOP-1.11-orig/t/083_load_class.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/083_load_class.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 require Class::MOP;
@@ -168,4 +168,4 @@
 
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/085_load_class_gvstash_detect_bug.t Class-MOP-1.11/t/085_load_class_gvstash_detect_bug.t
--- Class-MOP-1.11-orig/t/085_load_class_gvstash_detect_bug.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/085_load_class_gvstash_detect_bug.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -20,4 +20,4 @@
     TestClassLoaded->a_method;
 }, undef );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/086_rebless_instance_away.t Class-MOP-1.11/t/086_rebless_instance_away.t
--- Class-MOP-1.11-orig/t/086_rebless_instance_away.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/086_rebless_instance_away.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my @calls;
@@ -42,4 +42,4 @@
 is($calls[0][4], 1);
 splice @calls;
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/087_subclasses.t Class-MOP-1.11/t/087_subclasses.t
--- Class-MOP-1.11-orig/t/087_subclasses.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/087_subclasses.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 do {
@@ -42,4 +42,4 @@
 is_deeply([sort Daughter->meta->direct_subclasses],    []);
 is_deeply([sort Cousin->meta->direct_subclasses],      []);
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/090_meta_method.t Class-MOP-1.11/t/090_meta_method.t
--- Class-MOP-1.11-orig/t/090_meta_method.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/090_meta_method.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 use Class::MOP;
 
@@ -64,4 +64,4 @@
     is( exception { $meta->class_precedence_list }, undef, "can do meta-level stuff" );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/100_BinaryTree_test.t Class-MOP-1.11/t/100_BinaryTree_test.t
--- Class-MOP-1.11-orig/t/100_BinaryTree_test.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/100_BinaryTree_test.t	2010-11-11 22:57:52.000000000 +0100
@@ -4,7 +4,7 @@
 use FindBin;
 use File::Spec::Functions;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -329,4 +329,4 @@
         '... this should be the reverse of the original');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/101_InstanceCountingClass_test.t Class-MOP-1.11/t/101_InstanceCountingClass_test.t
--- Class-MOP-1.11-orig/t/101_InstanceCountingClass_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/101_InstanceCountingClass_test.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -56,4 +56,4 @@
 is(Foo->meta->get_count(), 10, '... our Foo count is now 10');
 is(Bar->meta->get_count(), 1, '... our Bar count is still 1');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/102_InsideOutClass_test.t Class-MOP-1.11/t/102_InsideOutClass_test.t
--- Class-MOP-1.11-orig/t/102_InsideOutClass_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/102_InsideOutClass_test.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Scalar::Util 'reftype';
 
@@ -221,4 +221,4 @@
     is(scalar(keys(%{'Bar::Baz::bling'})), 0, '... got the right number of entries for Bar::Baz::bling');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/103_Perl6Attribute_test.t Class-MOP-1.11/t/103_Perl6Attribute_test.t
--- Class-MOP-1.11-orig/t/103_Perl6Attribute_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/103_Perl6Attribute_test.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -40,4 +40,4 @@
 is_deeply($foo->bar, [], '... Foo.bar == []');
 is_deeply($foo->baz, {}, '... Foo.baz == {}');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/104_AttributesWithHistory_test.t Class-MOP-1.11/t/104_AttributesWithHistory_test.t
--- Class-MOP-1.11-orig/t/104_AttributesWithHistory_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/104_AttributesWithHistory_test.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -118,4 +118,4 @@
     [ 42, 43, 44, 45, 46 ],
     '... still have the correct history for foo');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/105_ClassEncapsulatedAttributes_test.t Class-MOP-1.11/t/105_ClassEncapsulatedAttributes_test.t
--- Class-MOP-1.11-orig/t/105_ClassEncapsulatedAttributes_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/105_ClassEncapsulatedAttributes_test.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -106,4 +106,4 @@
     is($bar->SUPER_foo(), 'Foo::foo', '... got the right default value for Bar::SUPER::foo');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/106_LazyClass_test.t Class-MOP-1.11/t/106_LazyClass_test.t
--- Class-MOP-1.11-orig/t/106_LazyClass_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/106_LazyClass_test.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 
 use Class::MOP;
@@ -80,4 +80,4 @@
 ok(!exists($root->right->{'left'}), '... left attribute still has not been initialized yet');
 ok(!exists($root->right->{'right'}), '... right attribute still has not been initialized yet');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/107_C3MethodDispatchOrder_test.t Class-MOP-1.11/t/107_C3MethodDispatchOrder_test.t
--- Class-MOP-1.11-orig/t/107_C3MethodDispatchOrder_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/107_C3MethodDispatchOrder_test.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Class::MOP;
 
@@ -42,4 +42,4 @@
 is(Diamond_D->hello, 'Diamond_C::hello', '... got the right dispatch order');
 is(Diamond_D->can('hello')->(), 'Diamond_C::hello', '... can(method) resolved itself as expected');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/108_ArrayBasedStorage_test.t Class-MOP-1.11/t/108_ArrayBasedStorage_test.t
--- Class-MOP-1.11-orig/t/108_ArrayBasedStorage_test.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/108_ArrayBasedStorage_test.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use File::Spec;
 use Scalar::Util 'reftype';
 use Class::MOP;
@@ -201,4 +201,4 @@
 
 cmp_ok( scalar(@$new_baz), ">", scalar(@$baz), "additional slot due to refreshed meta instance" );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/200_Class_C3_compatibility.t Class-MOP-1.11/t/200_Class_C3_compatibility.t
--- Class-MOP-1.11-orig/t/200_Class_C3_compatibility.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/200_Class_C3_compatibility.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 =pod
 
@@ -61,4 +61,4 @@
     ok(defined &Diamond_D::hello, '... D does have an alias to the method hello');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/300_random_eval_bug.t Class-MOP-1.11/t/300_random_eval_bug.t
--- Class-MOP-1.11-orig/t/300_random_eval_bug.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/300_random_eval_bug.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -47,4 +47,4 @@
 };
 ok( $@, '... we die correctly with bad args' );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/301_RT_27329_fix.t Class-MOP-1.11/t/301_RT_27329_fix.t
--- Class-MOP-1.11-orig/t/301_RT_27329_fix.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/301_RT_27329_fix.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -44,4 +44,4 @@
     ok(!defined($clone->get_foo), '... got the right cloned value');
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/302_modify_parent_method.t Class-MOP-1.11/t/302_modify_parent_method.t
--- Class-MOP-1.11-orig/t/302_modify_parent_method.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/302_modify_parent_method.t	2010-11-11 22:57:50.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -98,4 +98,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/303_RT_39001_fix.t Class-MOP-1.11/t/303_RT_39001_fix.t
--- Class-MOP-1.11-orig/t/303_RT_39001_fix.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/303_RT_39001_fix.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -37,4 +37,4 @@
     Bar->meta->superclasses('Foo');
 }, qr/^Recursive inheritance detected/, "error occurs when Bar extends Foo, when Foo is a Bar" );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/304_constant_codeinfo.t Class-MOP-1.11/t/304_constant_codeinfo.t
--- Class-MOP-1.11-orig/t/304_constant_codeinfo.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/304_constant_codeinfo.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -19,4 +19,4 @@
 $syms = $meta->get_all_package_symbols('CODE');
 is(ref $syms->{FOO}, 'CODE', 'constant symbol still there, although we dropped our reference');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/305_RT_41255.t Class-MOP-1.11/t/305_RT_41255.t
--- Class-MOP-1.11-orig/t/305_RT_41255.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/305_RT_41255.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,5 +1,5 @@
 use strict;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -48,4 +48,4 @@
     is( exception { $meta_method->execute }, undef );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/306_rebless_overload.t Class-MOP-1.11/t/306_rebless_overload.t
--- Class-MOP-1.11-orig/t/306_rebless_overload.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/306_rebless_overload.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 do {
@@ -24,4 +24,4 @@
 $meta->rebless_instance($without);
 is("$without", "overloaded", "overloading after reblessing works");
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/307_null_stash.t Class-MOP-1.11/t/307_null_stash.t
--- Class-MOP-1.11-orig/t/307_null_stash.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/307_null_stash.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 my $non = Class::MOP::Class->initialize('Non::Existent::Package');
@@ -9,4 +9,4 @@
 
 pass("empty stashes don't segfault");
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/308_insertion_order.t Class-MOP-1.11/t/308_insertion_order.t
--- Class-MOP-1.11-orig/t/308_insertion_order.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/308_insertion_order.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 my $Point = Class::MOP::Class->create('Point' => (
@@ -32,4 +32,4 @@
 is($Point->get_attribute('x')->insertion_order, 0, 'Insertion order of Attribute "x"');
 is($Point->get_attribute('y')->insertion_order, 1, 'Insertion order of Attribute "y"');
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/309_subname.t Class-MOP-1.11/t/309_subname.t
--- Class-MOP-1.11-orig/t/309_subname.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/309_subname.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Class::MOP;
 
@@ -39,4 +39,4 @@
 
 is( Origin->bar, "Origin::bar", "unrelated class untouched" );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/310_inline_structor.t Class-MOP-1.11/t/310_inline_structor.t
--- Class-MOP-1.11-orig/t/310_inline_structor.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/310_inline_structor.t	2010-11-11 22:57:51.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::Output' => '0.01', # skip all if not installed
@@ -292,4 +292,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/311_inline_and_dollar_at.t Class-MOP-1.11/t/311_inline_and_dollar_at.t
--- Class-MOP-1.11-orig/t/311_inline_and_dollar_at.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/311_inline_and_dollar_at.t	2010-11-11 22:57:54.000000000 +0100
@@ -1,6 +1,6 @@
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use Class::MOP;
 
 
@@ -16,4 +16,4 @@
     ::is( $@, 'dollar at', '$@ is untouched after immutablization' );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/312_anon_class_leak.t Class-MOP-1.11/t/312_anon_class_leak.t
--- Class-MOP-1.11-orig/t/312_anon_class_leak.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/312_anon_class_leak.t	2010-11-11 22:57:54.000000000 +0100
@@ -2,7 +2,7 @@
 use warnings;
 
 use Class::MOP;
-use Test::More;
+use Test::More qw(no_plan);
 
 use Test::Requires {
     'Test::LeakTrace' => '0.01', # skip all if not installed
@@ -21,4 +21,4 @@
 }
 '<=', $expected, 'create_anon_class(superclass => [...])';
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/313_before_after_dollar_under.t Class-MOP-1.11/t/313_before_after_dollar_under.t
--- Class-MOP-1.11-orig/t/313_before_after_dollar_under.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/313_before_after_dollar_under.t	2010-11-11 22:57:52.000000000 +0100
@@ -3,7 +3,7 @@
 
 use Class::MOP;
 use Class::MOP::Class;
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 my %results;
@@ -67,4 +67,4 @@
     );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/314_class_is_pristine.t Class-MOP-1.11/t/314_class_is_pristine.t
--- Class-MOP-1.11-orig/t/314_class_is_pristine.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/314_class_is_pristine.t	2010-11-11 22:57:52.000000000 +0100
@@ -2,7 +2,7 @@
 use warnings;
 
 use Class::MOP;
-use Test::More;
+use Test::More qw(no_plan);
 
 {
     package Foo;
@@ -20,4 +20,4 @@
 $meta->add_attribute( name => 'attr', reader => 'get_attr' );
 ok( ! $meta->is_pristine, 'Foo is not pristine after add_attribute' );
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/315_magic.t Class-MOP-1.11/t/315_magic.t
--- Class-MOP-1.11-orig/t/315_magic.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/315_magic.t	2010-11-11 22:57:52.000000000 +0100
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Class::MOP;
@@ -72,4 +72,4 @@
     }, undef );
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/316_numeric_defaults.t Class-MOP-1.11/t/316_numeric_defaults.t
--- Class-MOP-1.11-orig/t/316_numeric_defaults.t	2010-10-27 21:58:46.000000000 +0200
+++ Class-MOP-1.11/t/316_numeric_defaults.t	2010-11-11 22:57:53.000000000 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 use strict;
 use warnings;
-use Test::More;
+use Test::More qw(no_plan);
 use B;
 use Class::MOP;
 
@@ -122,4 +122,4 @@
     }
 }
 
-done_testing;
+#done_testing;
diff -ruN Class-MOP-1.11-orig/t/500_deprecated.t Class-MOP-1.11/t/500_deprecated.t
--- Class-MOP-1.11-orig/t/500_deprecated.t	2010-10-29 15:59:36.000000000 +0200
+++ Class-MOP-1.11/t/500_deprecated.t	2010-11-11 22:57:52.000000000 +0100
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More qw(no_plan);
 use Test::Fatal;
 
 use Carp;
@@ -70,4 +70,4 @@
     );
 }
 
-done_testing;
+#done_testing;