Hello community,
here is the log from the commit of package perl-Test-Inter for openSUSE:Factory
checked in at 2019-03-18 10:36:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Test-Inter (Old)
and /work/SRC/openSUSE:Factory/.perl-Test-Inter.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Test-Inter"
Mon Mar 18 10:36:34 2019 rev:15 rq:685286 version:1.09
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Test-Inter/perl-Test-Inter.changes
2018-03-19 23:40:07.881558770 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Test-Inter.new.28833/perl-Test-Inter.changes
2019-03-18 10:36:35.059514825 +0100
@@ -1,0 +2,21 @@
+Fri Mar 15 06:30:17 UTC 2019 - Stephan Kulow <[email protected]>
+
+- updated to 1.09
+ see /usr/share/doc/packages/perl-Test-Inter/Changes
+
+ 1.09 2019-04-13
+ - Added test directory to directories added in the use_lib method
automatically.
+ - Added functionality to the testdir method
+
+-------------------------------------------------------------------
+Wed Mar 13 06:38:48 UTC 2019 - Stephan Kulow <[email protected]>
+
+- updated to 1.08
+ see /usr/share/doc/packages/perl-Test-Inter/Changes
+
+ 1.08 2019-03-12
+ - Minor improvement to a test.
+ - Added the use_lib method.
+ - Some improvements to the POD documentation.
+
+-------------------------------------------------------------------
Old:
----
Test-Inter-1.07.tar.gz
New:
----
Test-Inter-1.09.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Test-Inter.spec ++++++
--- /var/tmp/diff_new_pack.gfiPQt/_old 2019-03-18 10:36:36.703514468 +0100
+++ /var/tmp/diff_new_pack.gfiPQt/_new 2019-03-18 10:36:36.727514463 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-Test-Inter
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,24 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: perl-Test-Inter
-Version: 1.07
+Version: 1.09
Release: 0
%define cpan_name Test-Inter
-Summary: Framework for More Readable Interactive Test Scripts
+Summary: Framework for more readable interactive test scripts
License: Artistic-1.0 OR GPL-1.0-or-later
Group: Development/Libraries/Perl
-Url: http://search.cpan.org/dist/Test-Inter/
+Url: https://metacpan.org/release/%{cpan_name}
Source0:
https://cpan.metacpan.org/authors/id/S/SB/SBECK/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
+BuildRequires: perl(File::Find::Rule)
+BuildRequires: perl(Test::Pod) >= 1.00
+BuildRequires: perl(Test::Pod::Coverage) >= 1.00
%{perl_requires}
%description
@@ -56,11 +59,11 @@
find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
%check
-%{__make} test
+make test
%install
%perl_make_install
++++++ Test-Inter-1.07.tar.gz -> Test-Inter-1.09.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/.travis.yml
new/Test-Inter-1.09/.travis.yml
--- old/Test-Inter-1.07/.travis.yml 2014-09-10 16:15:44.000000000 +0200
+++ new/Test-Inter-1.09/.travis.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-language: perl
-perl:
- - "5.20"
- - "5.18"
- - "5.16"
- - "5.14"
- - "5.12"
- - "5.10"
- - "5.8"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/Changes new/Test-Inter-1.09/Changes
--- old/Test-Inter-1.07/Changes 2018-03-15 19:13:42.000000000 +0100
+++ new/Test-Inter-1.09/Changes 2019-03-14 18:36:42.000000000 +0100
@@ -2,6 +2,15 @@
Sullivan Beck ([email protected])
Any suggestions, bug reports, or donations :-) should be sent to me.
+1.09 2019-04-13
+ - Added test directory to directories added in the use_lib method
automatically.
+ - Added functionality to the testdir method
+
+1.08 2019-03-12
+ - Minor improvement to a test.
+ - Added the use_lib method and automatically use the 'lib' directory.
+ - Some improvements to the POD documentation.
+
1.07 2018-03-15
- Some improvements to the POD documentation.
- Some changes to get better test coverage.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/MANIFEST new/Test-Inter-1.09/MANIFEST
--- old/Test-Inter-1.07/MANIFEST 2018-03-15 19:14:09.000000000 +0100
+++ new/Test-Inter-1.09/MANIFEST 2019-03-14 18:37:52.000000000 +0100
@@ -1,4 +1,3 @@
-.travis.yml
Changes
examples/is
examples/ok
@@ -16,14 +15,15 @@
Makefile.PL
MANIFEST This list of files
README
+t/_pod.t
+t/_pod_coverage.t
+t/_version.t
t/file.1.exp
t/file.2.exp
t/file.2.in
t/file.t
t/is.t
t/ok.t
-t/pod.t
-t/pod_coverage.t
t/require_ok.t
t/runtests
t/runtests.bat
@@ -32,6 +32,5 @@
t/use_ok.1.t
t/use_ok.2.t
t/use_ok.3.t
-t/version.t
META.yml Module YAML meta-data (added by
MakeMaker)
META.json Module JSON meta-data (added by
MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/META.json
new/Test-Inter-1.09/META.json
--- old/Test-Inter-1.07/META.json 2018-03-15 19:14:09.000000000 +0100
+++ new/Test-Inter-1.09/META.json 2019-03-14 18:37:52.000000000 +0100
@@ -4,7 +4,7 @@
"Sullivan Beck ([email protected])"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter
version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter
version 2.150010",
"license" : [
"perl_5"
],
@@ -32,6 +32,7 @@
},
"runtime" : {
"requires" : {
+ "Cwd" : "0",
"File::Basename" : "0",
"IO::File" : "0",
"perl" : "5.006"
@@ -39,15 +40,17 @@
},
"test" : {
"requires" : {
- "Cwd" : "0",
- "Test::More" : "0"
+ "File::Find::Rule" : "0",
+ "Test::More" : "0",
+ "Test::Pod" : "1.00",
+ "Test::Pod::Coverage" : "1.00"
}
}
},
"provides" : {
"Test::Inter" : {
"file" : "lib/Test/Inter.pm",
- "version" : "1.07"
+ "version" : "1.09"
}
},
"release_status" : "stable",
@@ -58,6 +61,6 @@
"web" : "https://github.com/SBECK-github/Test-Inter";
}
},
- "version" : "1.07",
- "x_serialization_backend" : "JSON::PP version 2.97001"
+ "version" : "1.09",
+ "x_serialization_backend" : "JSON::PP version 4.01"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/META.yml new/Test-Inter-1.09/META.yml
--- old/Test-Inter-1.07/META.yml 2018-03-15 19:14:09.000000000 +0100
+++ new/Test-Inter-1.09/META.yml 2019-03-14 18:37:52.000000000 +0100
@@ -3,13 +3,15 @@
author:
- 'Sullivan Beck ([email protected])'
build_requires:
- Cwd: '0'
ExtUtils::MakeMaker: '0'
+ File::Find::Rule: '0'
Test::More: '0'
+ Test::Pod: '1.00'
+ Test::Pod::Coverage: '1.00'
configure_requires:
ExtUtils::MakeMaker: '6.30'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version
2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version
2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,12 +24,13 @@
provides:
Test::Inter:
file: lib/Test/Inter.pm
- version: '1.07'
+ version: '1.09'
requires:
+ Cwd: '0'
File::Basename: '0'
IO::File: '0'
perl: '5.006'
resources:
repository: git://github.com/SBECK-github/Test-Inter.git
-version: '1.07'
+version: '1.09'
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/Makefile.PL
new/Test-Inter-1.09/Makefile.PL
--- old/Test-Inter-1.07/Makefile.PL 2018-03-15 19:14:08.000000000 +0100
+++ new/Test-Inter-1.09/Makefile.PL 2019-03-14 18:37:51.000000000 +0100
@@ -13,6 +13,7 @@
my $ConvVers= $ExtUtils::MakeMaker::VERSION;
my %module_prereq = (
+ 'Cwd' => '0',
'File::Basename' => '0',
'IO::File' => '0',
);
@@ -21,8 +22,10 @@
);
my %test_prereq = (
- 'Cwd' => '0',
+ 'File::Find::Rule' => '0',
'Test::More' => '0',
+ 'Test::Pod' => '1.00',
+ 'Test::Pod::Coverage' => '1.00',
);
my %config_prereq = (
@@ -38,7 +41,7 @@
WriteMakefile(
NAME => "Test::Inter",
- VERSION => "1.07",
+ VERSION => "1.09",
ABSTRACT => "framework for more readable interactive test scripts",
LICENSE => "perl",
($EU_MM_V >= 6.48
@@ -59,7 +62,7 @@
provides => {
'Test::Inter' => {
file => 'lib/Test/Inter.pm',
- version => '1.07',
+ version => '1.09',
},
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/README new/Test-Inter-1.09/README
--- old/Test-Inter-1.07/README 2018-03-15 19:14:09.000000000 +0100
+++ new/Test-Inter-1.09/README 2019-03-14 18:37:52.000000000 +0100
@@ -284,6 +284,7 @@
mode
skip_all
width
+ use_lib
version
$o->version();
@@ -436,6 +437,26 @@
lines longer then this are truncated). If WIDTH is set to 0, no
truncation is done.
+ use_lib
+ $o = new Test::Inter 'use_lib' => VALUE;
+ $o->use_lib(VALUE);
+ $o->use_lib();
+
+ By default, the library included in the module distribution will be
+ added to the search path for modules, so a 'use MODULE' line should
+ find the version stored in this module distribution.
+
+ If VALUE is set to 'off', the search path will not be modified
+ automatically.
+
+ You may add the library path at a later time by calling:
+
+ $o->use_lib('on');
+ $o->use_lib();
+
+ Note: both calls must be used. The first sets the option, the second
+ actually modifies the search path.
+
skip_all
$o = new Test::Inter 'skip_all' => REASON;
$o->skip_all(REASON);
@@ -476,9 +497,17 @@
but they will be printed if the quiet method is set to 1.
testdir
- Occasionally, it may be necessary to know the directory where the
- tests live (for example, there may be a config or data file in
- there). This method will return the directory.
+ $o->testdir();
+ $o->testdir('mod');
+ $o->testdir('lib');
+
+ Occasionally, it may be necessary to know the directory where
+ Test::Inter gets some of it's information. By default, the directory
+ containing the tests will be returned, but if the optional argument
+ 'mod' is included, it will return the path to the module
+ distribution (which should include both a lib and t subdirerctory).
+ If the argument 'lib' is included, it will return the directory
+ where the libraries are stored.
METHODS FOR LOADING MODULES
Test scripts can load other modules (using either the perl "use" or
@@ -1073,10 +1102,13 @@
it is formatted:
TI_QUIET
- How verbose the test script is.
+ How verbose the test script is. Values are 0 (most verbose) to 2
+ (least verbose).
TI_MODE
- How the output is formatted.
+ How the output is formatted. Values are 'inter' (interactive mode)
+ or 'test' (test suite mode). Interactive mode is easier to read.
+ Test mode is for running as part of a test suite.
TI_WIDTH
The width of the terminal.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/internal/TODO
new/Test-Inter-1.09/internal/TODO
--- old/Test-Inter-1.07/internal/TODO 2014-09-10 17:07:20.000000000 +0200
+++ new/Test-Inter-1.09/internal/TODO 2019-03-13 14:32:48.000000000 +0100
@@ -27,6 +27,8 @@
ok 1 (12 ms)
ok 2 (23 ms)
+Name each test (and break on test name) even if tests defined in a string.
+
=========================================================================
OLD STUFF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/internal/ispell.isp
new/Test-Inter-1.09/internal/ispell.isp
--- old/Test-Inter-1.07/internal/ispell.isp 2018-03-01 15:13:36.000000000
+0100
+++ new/Test-Inter-1.09/internal/ispell.isp 2019-03-12 20:12:21.000000000
+0100
@@ -4,13 +4,19 @@
config
cpan
diag
+Dist
ENV
eq
foo
foreach
func
+GitHub
+github
hashref
hashrefs
+html
+http
+https
isnt
listref
listrefs
@@ -26,6 +32,7 @@
perl
perl's
qw
+rt
sbeck
testdir
testnum
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/lib/Test/Inter.pm
new/Test-Inter-1.09/lib/Test/Inter.pm
--- old/Test-Inter-1.07/lib/Test/Inter.pm 2018-03-15 19:05:03.000000000
+0100
+++ new/Test-Inter-1.09/lib/Test/Inter.pm 2019-03-13 19:58:45.000000000
+0100
@@ -1,5 +1,5 @@
package Test::Inter;
-# Copyright (c) 2010-2015 Sullivan Beck. All rights reserved.
+# Copyright (c) 2010-2019 Sullivan Beck. All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -11,9 +11,10 @@
use strict;
use File::Basename;
use IO::File;
+use Cwd 'abs_path';
our($VERSION);
-$VERSION = '1.07';
+$VERSION = '1.09';
###############################################################################
# BASE METHODS
@@ -51,6 +52,8 @@
'mode' => 'test', # mode to run script in
'width' => 80, # width of terminal
'features' => {}, # a list of available features
+ 'use_lib' => 'on', # whether to run 'use lib' when loading
+ # this module
'skipall' => '', # the reason for skipping all
# remaining tests
@@ -99,39 +102,60 @@
print "\nRunning $name...\n";
}
- # Find the test directory
- #
- # Scripts will either be run:
- # directly (look at $0)
- # as a test suite (look for ./t and ../t)
+ # We assume that the module is distributed in a directory with the correct
+ # hierarchy. This is:
+ # /some/path MODDIR
+ # /t TESTDIR
+ # /lib LIBDIR
+ # We'll find the full path to each.
+
+ my($moddir,$testdir,$libdir);
- my($TDIR,@LIBDIR);
if (-f "$0") {
- my $COM = $0;
- $TDIR = dirname($COM);
- $TDIR = '.' if (! $TDIR);
- } elsif (-d 't') {
- $TDIR = 't';
- } else {
- $TDIR = '.';
+ $moddir = dirname(dirname(abs_path($0)));
+ } elsif (-d "./t") {
+ $moddir = dirname(abs_path('.'));
+ } elsif (-d "../t") {
+ $moddir = dirname(abs_path('..'));
}
-
- @LIBDIR = ('.');
- if (-d "$TDIR/lib") {
- push(@LIBDIR,"$TDIR/lib");
+ if (-d "$moddir/t") {
+ $testdir = "$moddir/t";
}
- if (-d "$TDIR/../lib") {
- push(@LIBDIR,"$TDIR/../lib");
+ if (-d "$moddir/lib") {
+ $libdir = "$moddir/lib";
}
- $$self{'testdir'} = $TDIR;
- $$self{'libdir'} = \@LIBDIR;
+ $$self{'moddir'} = $moddir;
+ $$self{'testdir'} = $testdir;
+ $$self{'libdir'} = $libdir;
+
+ $self->use_lib();
return $self;
}
+sub use_lib {
+ my($self,$val) = @_;
+ if (defined $val) {
+ $$self{'use_lib'} = $val;
+ return;
+ }
+
+ if ($$self{'use_lib'} eq 'on') {
+ foreach my $dir ($$self{'libdir'},$$self{'testdir'}) {
+ next if (! defined $dir);
+ eval "use lib '$dir'";
+ }
+ }
+}
+
sub testdir {
- my($self) = @_;
+ my($self,$req) = @_;
+ if ($req && $req eq 'mod') {
+ return $$self{'moddir'};
+ } elsif ($req && $req eq 'lib') {
+ return $$self{'libdir'};
+ }
return $$self{'testdir'};
}
@@ -283,7 +307,7 @@
$main::TI_NUM++ unless ($mode eq 'feature');
my $pack = caller;
- my @inc = map { "unshift(\@INC,'$_');\n" } @{ $$self{'libdir'} };
+ my @inc = map { "unshift(\@INC,'$_');\n" }
($$self{'libdir'},$$self{'testdir'});
my($desc,$code);
@@ -297,10 +321,12 @@
} else {
$module = qq['$module'] unless $self->_is_module_name($module);
$desc = "require $module";
+ my $p = "package"; # So the following do not get picked up by
cpantorpm-depreq
+ my $r = "require";
$code = <<REQUIRE;
-package $pack;
+$p $pack;
@inc
-require $module;
+$r $module;
1;
REQUIRE
}
@@ -398,10 +424,11 @@
my $imports = (@args ? 'qw(' . join(' ',@args) . ')' : '');
$desc = "use $module $vers $imports";
- my @inc = map { "unshift(\@INC,'$_');\n" } @{ $$self{'libdir'} };
+ my @inc = map { "unshift(\@INC,'$_');\n" }
($$self{'libdir'},$$self{'testdir'});
+ my $p = "package"; # So the following do not get picked up by
cpantorpm-depreq
$code = <<USE;
-package $pack;
+$p $pack;
@inc
use $module $vers $imports;
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/lib/Test/Inter.pod
new/Test-Inter-1.09/lib/Test/Inter.pod
--- old/Test-Inter-1.07/lib/Test/Inter.pod 2018-03-15 19:11:19.000000000
+0100
+++ new/Test-Inter-1.09/lib/Test/Inter.pod 2019-03-13 18:15:07.000000000
+0100
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2015 Sullivan Beck. All rights reserved.
+# Copyright (c) 2010-2019 Sullivan Beck. All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the same terms as Perl itself.
@@ -317,6 +317,7 @@
mode
skip_all
width
+ use_lib
=item B<version>
@@ -478,6 +479,26 @@
lines longer then this are truncated). If WIDTH is set to 0, no
truncation is done.
+=item B<use_lib>
+
+ $o = new Test::Inter 'use_lib' => VALUE;
+ $o->use_lib(VALUE);
+ $o->use_lib();
+
+By default, the library included in the module distribution will be added
+to the search path for modules, so a 'use MODULE' line should find the
+version stored in this module distribution.
+
+If VALUE is set to 'off', the search path will not be modified automatically.
+
+You may add the library path at a later time by calling:
+
+ $o->use_lib('on');
+ $o->use_lib();
+
+Note: both calls must be used. The first sets the option, the second actually
+modifies the search path.
+
=item B<skip_all>
$o = new Test::Inter 'skip_all' => REASON;
@@ -523,9 +544,16 @@
=item B<testdir>
-Occasionally, it may be necessary to know the directory where the
-tests live (for example, there may be a config or data file in there).
-This method will return the directory.
+ $o->testdir();
+ $o->testdir('mod');
+ $o->testdir('lib');
+
+Occasionally, it may be necessary to know the directory where Test::Inter
+gets some of it's information. By default, the directory containing the
+tests will be returned, but if the optional argument 'mod' is included,
+it will return the path to the module distribution (which should include
+both a lib and t subdirerctory). If the argument 'lib' is included, it
+will return the directory where the libraries are stored.
=back
@@ -1170,11 +1198,14 @@
=item TI_QUIET
-How verbose the test script is.
+How verbose the test script is. Values are 0 (most verbose) to 2
+(least verbose).
=item TI_MODE
-How the output is formatted.
+How the output is formatted. Values are 'inter' (interactive mode) or
+'test' (test suite mode). Interactive mode is easier to read. Test mode
+is for running as part of a test suite.
=item TI_WIDTH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/_pod.t new/Test-Inter-1.09/t/_pod.t
--- old/Test-Inter-1.07/t/_pod.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Test-Inter-1.09/t/_pod.t 2019-03-14 18:37:51.000000000 +0100
@@ -0,0 +1,84 @@
+#!/usr/bin/perl
+
+use warnings 'all';
+use strict;
+use Test::More;
+use File::Basename;
+use Cwd 'abs_path';
+use Test::Pod 1.00;
+
+# Don't run tests for installs
+unless ($ENV{RELEASE_TESTING}) {
+ plan skip_all => 'Author tests not required for installation (set
RELEASE_TESTING to test)';
+}
+
+# Figure out the directories. This comes from Test::Inter.
+
+my($moddir,$testdir,$libdir);
+
+BEGIN {
+ if (-f "$0") {
+ $moddir = dirname(dirname(abs_path($0)));
+ } elsif (-d "./t") {
+ $moddir = dirname(abs_path('.'));
+ } elsif (-d "../t") {
+ $moddir = dirname(abs_path('..'));
+ }
+ if (-d "$moddir/t") {
+ $testdir = "$moddir/t";
+ }
+ if (-d "$moddir/lib") {
+ $libdir = "$moddir/lib";
+ }
+}
+
+# If there is a file _pod.ign, it should be a list of filename
+# substrings to ignore (any file with any of these substrings
+# will be ignored).
+#
+# If there is a file named _pod.dirs, then pod files will be looked
+# at in those directories (instead of the default of all directories).
+
+my @ign = ();
+if (-f "$testdir/_pod.ign") {
+ open(IN,"$testdir/_pod.ign");
+ @ign = <IN>;
+ close(IN);
+ chomp(@ign);
+}
+
+my @dirs = ();
+if (-f "$testdir/_pod.dirs") {
+ open(IN,"$testdir/_pod.dirs");
+ @dirs = <IN>;
+ close(IN);
+ chomp(@dirs);
+}
+
+#
+# Test that the syntax of our POD documentation is valid.
+#
+
+chdir($moddir);
+
+if (@ign) {
+
+ my @file = all_pod_files(@dirs);
+ my @test;
+
+ FILE:
+ foreach my $file (@file) {
+ foreach my $ign (@ign) {
+ next FILE if ($file =~ /\Q$ign\E/);
+ }
+ push(@test,$file);
+ }
+
+ plan tests => scalar(@test);
+ foreach my $file (@test) {
+ pod_file_ok($file);
+ }
+
+} else {
+ all_pod_files_ok(@dirs);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/_pod_coverage.t
new/Test-Inter-1.09/t/_pod_coverage.t
--- old/Test-Inter-1.07/t/_pod_coverage.t 1970-01-01 01:00:00.000000000
+0100
+++ new/Test-Inter-1.09/t/_pod_coverage.t 2019-03-14 18:37:51.000000000
+0100
@@ -0,0 +1,75 @@
+#!/usr/bin/perl
+
+use warnings 'all';
+use strict;
+use Test::More;
+use File::Basename;
+use Cwd 'abs_path';
+use Test::Pod::Coverage 1.00;
+
+# Don't run tests for installs
+unless ($ENV{RELEASE_TESTING}) {
+ plan skip_all => 'Author tests not required for installation (set
RELEASE_TESTING to test)';
+}
+
+# Figure out the directories. This comes from Test::Inter.
+
+my($moddir,$testdir,$libdir);
+
+BEGIN {
+ if (-f "$0") {
+ $moddir = dirname(dirname(abs_path($0)));
+ } elsif (-d "./t") {
+ $moddir = dirname(abs_path('.'));
+ } elsif (-d "../t") {
+ $moddir = dirname(abs_path('..'));
+ }
+ if (-d "$moddir/t") {
+ $testdir = "$moddir/t";
+ }
+ if (-d "$moddir/lib") {
+ $libdir = "$moddir/lib";
+ }
+}
+use lib $libdir;
+
+# If there is a file _pod_coverage.ign, it should be a list of module
+# name substrings to ignore (any module with any of these substrings
+# will be ignored).
+
+my @ign = ();
+if (-f "$testdir/_pod_coverage.ign") {
+ open(IN,"$testdir/_pod_coverage.ign");
+ @ign = <IN>;
+ close(IN);
+ chomp(@ign);
+}
+
+#
+# Test that the POD documentation is complete.
+#
+
+chdir($moddir);
+
+if (@ign) {
+
+ my @mod = all_modules('lib');
+ my @test = ();
+
+ MOD:
+ foreach my $mod (@mod) {
+ foreach my $ign (@ign) {
+ next MOD if ($mod =~ /\Q$ign\E/);
+ }
+ push(@test,$mod);
+ }
+
+ chdir($libdir);
+ plan tests => scalar(@test);
+ foreach my $mod (@test) {
+ pod_coverage_ok($mod);
+ }
+
+} else {
+ all_pod_coverage_ok();
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/_version.t
new/Test-Inter-1.09/t/_version.t
--- old/Test-Inter-1.07/t/_version.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Test-Inter-1.09/t/_version.t 2019-03-14 18:37:51.000000000 +0100
@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+
+use warnings 'all';
+use strict;
+use Test::Inter;
+use IO::File;
+use File::Find::Rule;
+my $ti = new Test::Inter $0;
+
+unless ($ENV{RELEASE_TESTING}) {
+ $ti->skip_all('Author tests not required for installation (set
RELEASE_TESTING to test)');
+}
+
+# Figure out what module we are in. A module is in a directory:
+# My-Mod-Name-1.00
+# It includes any number of .pm files, each of which contain a single
+# package. Every package is named:
+# My::Pack::Name
+# and includes a variable:
+# My::Pack::Name::VERSION
+
+my $testdir = $ti->testdir();
+my $moddir = $ti->testdir('mod');
+my $libdir = $ti->testdir('lib');
+my @dir = split(/\//,$moddir);
+my $dir = pop(@dir);
+
+my($mod,$vers,$valid);
+if ($dir =~ /^(.*)\-(\d+\.\d+)$/) {
+ $mod = $1;
+ $vers = $2;
+ $valid = 1;
+} else {
+ $valid = 0;
+}
+
+# If there is a file _version.ign, it should be a list of filename
+# substrings to ignore (any .pm file with any of these substrings
+# will be ignored).
+
+my @ign = ();
+if (-f "$testdir/_version.ign") {
+ open(IN,"$testdir/_version.ign");
+ @ign = <IN>;
+ close(IN);
+ chomp(@ign);
+}
+
+$ti->ok($valid,"Valid directory");
+$ti->skip_all('Remaining tests require a valid directory') if (! defined
$vers);
+
+my $in = new IO::File;
+my @files = File::Find::Rule->file()->name('*.pm')->in($libdir);
+
+FILE:
+foreach my $file (@files) {
+
+ foreach my $ign (@ign) {
+ next FILE if ($file =~ /\Q$ign\E/);
+ }
+
+ $in->open($file);
+ my @tmp = <$in>;
+ chomp(@tmp);
+ my @v = grep /^\$VERSION\s*=\s*['"]\d+\.\d+['"];$/, @tmp;
+ if (! @v) {
+ $ti->ok(0,$file);
+ $ti->diag('File contains no valid version line');
+ } elsif (@v > 1) {
+ $ti->ok(0,$file);
+ $ti->diag('File contains multiple version lines');
+ } else {
+ $v[0] =~ /['"](\d+\.\d+)['"]/;
+ my $v = $1;
+ $ti->is($v,$vers,$file);
+ $ti->diag('File contains incorrect version number') if ($v ne $vers);
+ }
+}
+
+$ti->done_testing();
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/file.t new/Test-Inter-1.09/t/file.t
--- old/Test-Inter-1.07/t/file.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/file.t 2019-03-13 14:36:58.000000000 +0100
@@ -1,15 +1,25 @@
#!/usr/bin/perl
+use warnings 'all';
+use strict;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
+
use Test::Inter;
-$o = new Test::Inter;
+my $ti = new Test::Inter $0;
sub func1 {
- my($output) = @_;
+ my($tiutput) = @_;
my @lines = ("First line",
"Second line",
"Third line");
- open(OUT,">$output");
+ open(OUT,">$tiutput");
foreach my $line (@lines) {
print OUT "$line\n";
}
@@ -17,18 +27,18 @@
}
sub func2 {
- my($input,$output) = @_;
+ my($input,$tiutput) = @_;
open(IN,$input);
- open(OUT,">$output");
+ open(OUT,">$tiutput");
my @lines = <IN>;
print OUT @lines;
close(IN);
close(OUT);
}
-$o->file(\&func1,'', '','file.1.exp','No input');
+$ti->file(\&func1,'', '','file.1.exp','No input');
-$o->file(\&func2,'file.2.in','','file.2.exp','File copy');
+$ti->file(\&func2,'file.2.in','','file.2.exp','File copy');
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/is.t new/Test-Inter-1.09/t/is.t
--- old/Test-Inter-1.07/t/is.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/is.t 2019-03-13 14:37:02.000000000 +0100
@@ -1,13 +1,23 @@
#!/usr/bin/perl
+use warnings 'all';
+use strict;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
+
use Test::Inter;
-$o = new Test::Inter;
+my $ti = new Test::Inter $0;
-$o->is ( [ 'a','b' ], [ 'a','b' ], "List test" );
-$o->isnt( [ 'a','b' ], [ 'a','c' ], "List test" );
+$ti->is ( [ 'a','b' ], [ 'a','b' ], "List test" );
+$ti->isnt( [ 'a','b' ], [ 'a','c' ], "List test" );
-$o->is ( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 2 }, "Hash test" );
-$o->isnt( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 3 }, "Hash test" );
+$ti->is ( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 2 }, "Hash test" );
+$ti->isnt( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 3 }, "Hash test" );
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/ok.t new/Test-Inter-1.09/t/ok.t
--- old/Test-Inter-1.07/t/ok.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/ok.t 2019-03-13 14:37:18.000000000 +0100
@@ -1,13 +1,23 @@
#!/usr/bin/perl
+use warnings 'all';
+use strict;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
+
use Test::Inter;
-$o = new Test::Inter;
+my $ti = new Test::Inter $0;
-$o->ok();
-$o->ok( 1 == 1 );
-$o->ok( 1 == 1, "Basic test" );
-$o->ok( 1 == 1, 1, "Basic test" );
-$o->ok( 1 == 1, 2, "Basic test" );
+$ti->ok();
+$ti->ok( 1 == 1 );
+$ti->ok( 1 == 1, "Basic test" );
+$ti->ok( 1 == 1, 1, "Basic test" );
+$ti->ok( 1 == 1, 2, "Basic test" );
sub func_false {
return 0;
@@ -21,21 +31,21 @@
return $a == $b;
}
-$o->ok( \&func_true );
-$o->ok( \&func_true, "True test" );
-$o->ok( \&func_true, 1, "True test" );
-$o->ok( \&func_true, 2, "True test" );
-
-$o->ok( \&func, [1,1]);
-$o->ok( \&func, [1,1], "Func test" );
-$o->ok( \&func, [1,1], 1, "Func test" );
-$o->ok( \&func, [1,1], 2, "Func test" );
+$ti->ok( \&func_true );
+$ti->ok( \&func_true, "True test" );
+$ti->ok( \&func_true, 1, "True test" );
+$ti->ok( \&func_true, 2, "True test" );
+
+$ti->ok( \&func, [1,1]);
+$ti->ok( \&func, [1,1], "Func test" );
+$ti->ok( \&func, [1,1], 1, "Func test" );
+$ti->ok( \&func, [1,1], 2, "Func test" );
-$o->ok( [ 'a','b' ], [ 'a','b' ], "List test" );
-$o->ok( [ 'a','b' ], [ 'a','c' ], "List test (non-identical)" );
+$ti->ok( [ 'a','b' ], [ 'a','b' ], "List test" );
+$ti->ok( [ 'a','b' ], [ 'a','c' ], "List test (non-identical)" );
-$o->ok( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 2 }, "Hash test" );
-$o->ok( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 3 }, "Hash test
(non-identical)" );
+$ti->ok( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 2 }, "Hash test" );
+$ti->ok( { 'a' => 1, 'b' => 2 }, { 'a' => 1, 'b' => 3 }, "Hash test
(non-identical)" );
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/pod.t new/Test-Inter-1.09/t/pod.t
--- old/Test-Inter-1.07/t/pod.t 2018-03-15 19:14:08.000000000 +0100
+++ new/Test-Inter-1.09/t/pod.t 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Test that the syntax of our POD documentation is valid.
-#
-
-use strict;
-use Test::More;
-
-# Don't run tests for installs
-unless ( $ENV{RELEASE_TESTING} ) {
- plan( skip_all => "Author tests not required for installation" );
-}
-
-eval "use Test::Pod 1.00";
-plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
-
-eval "use File::Basename";
-plan skip_all => "File::Basename required for testing POD" if $@;
-
-# If there is a file pod.ign, it should be a list of filename
-# substrings to ignore (any file with any of these substrings
-# will be ignored).
-
-# Find the pod.ign file
-
-my($testdir);
-if (-f "$0") {
- my $COM = $0;
- $testdir = dirname($COM);
- $testdir = '.' if (! $testdir);
-} elsif (-d 't') {
- $testdir = 't';
-} else {
- $testdir = '.';
-}
-
-my @ign = ();
-if (-f "$testdir/pod.ign") {
- open(IN,"$testdir/pod.ign");
- @ign = <IN>;
- close(IN);
- chomp(@ign);
-}
-
-my @dirs = ();
-if (-f "$testdir/pod.dirs") {
- open(IN,"$testdir/pod.dirs");
- @dirs = <IN>;
- close(IN);
- chomp(@dirs);
-}
-
-chdir("..") if ($testdir eq '.');
-
-if (@ign) {
-
- my @file = all_pod_files(@dirs);
-
- FILE:
- foreach my $file (@file) {
- foreach my $ign (@ign) {
- next FILE if ($file =~ /\Q$ign\E/);
- }
- pod_file_ok($file);
- }
- done_testing();
-
-} else {
- all_pod_files_ok(@dirs);
-}
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/pod_coverage.t
new/Test-Inter-1.09/t/pod_coverage.t
--- old/Test-Inter-1.07/t/pod_coverage.t 2018-03-15 19:14:08.000000000
+0100
+++ new/Test-Inter-1.09/t/pod_coverage.t 1970-01-01 01:00:00.000000000
+0100
@@ -1,64 +0,0 @@
-#!/usr/bin/perl
-
-#
-# Test that the POD documentation is complete.
-#
-
-use strict;
-use warnings;
-use Test::More;
-
-# Don't run tests for installs
-unless ( $ENV{RELEASE_TESTING} ) {
- plan( skip_all => "Author tests not required for installation" );
-}
-
-eval "use Test::Pod::Coverage 1.00";
-plan skip_all => "Test::Pod::Coverage 1.00 required for testing POD coverage"
- if $@;
-
-eval "use File::Basename";
-plan skip_all => "File::Basename required for testing POD coverage"
- if $@;
-
-# If there is a file pod_coverage.ign, it should be a list of module
-# name substrings to ignore (any module with any of these substrings
-# will be ignored).
-
-# Find the pod_coverage.ign file
-
-my($testdir);
-if (-f "$0") {
- my $COM = $0;
- $testdir = dirname($COM);
- $testdir = '.' if (! $testdir);
-} elsif (-d 't') {
- $testdir = 't';
-} else {
- $testdir = '.';
-}
-
-my @ign = ();
-if (-f "$testdir/pod_coverage.ign") {
- open my $fh, '<', "$testdir/pod_coverage.ign";
- chomp ( @ign = <$fh> );
- close $fh;
-}
-
-chdir("..") if ($testdir eq '.');
-
-if (@ign) {
- my @mod = all_modules();
-
- MOD:
- foreach my $mod (@mod) {
- foreach my $ign (@ign) {
- next MOD if ($mod =~ /\Q$ign\E/);
- }
- pod_coverage_ok($mod);
- }
- done_testing();
-
-} else {
- all_pod_coverage_ok();
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/require_ok.t
new/Test-Inter-1.09/t/require_ok.t
--- old/Test-Inter-1.07/t/require_ok.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/require_ok.t 2019-03-13 14:37:40.000000000 +0100
@@ -1,17 +1,24 @@
#!/usr/bin/perl
+use warnings 'all';
use strict;
-use warnings;
-use Test::Inter;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
-my $o = new Test::Inter;
+use Test::Inter;
+my $ti = new Test::Inter $0;
-$o->require_ok('5.001');
-$o->require_ok('7.001','forbid');
-$o->require_ok('Config');
-$o->require_ok('Xxx::Yyy','forbid');
-$o->require_ok('Symbol','feature');
-$o->require_ok('Xxx::Zzz','feature');
+$ti->require_ok('5.001');
+$ti->require_ok('7.001','forbid');
+$ti->require_ok('Config');
+$ti->require_ok('Xxx::Yyy','forbid');
+$ti->require_ok('Symbol','feature');
+$ti->require_ok('Xxx::Zzz','feature');
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/runtests.bat
new/Test-Inter-1.09/t/runtests.bat
--- old/Test-Inter-1.07/t/runtests.bat 2018-03-15 19:14:09.000000000 +0100
+++ new/Test-Inter-1.09/t/runtests.bat 2019-03-14 18:37:52.000000000 +0100
@@ -1,3 +1,4 @@
+perl -I../lib _version.t 1
perl -I../lib file.t 1
perl -I../lib is.t 1
perl -I../lib ok.t 1
@@ -7,4 +8,3 @@
perl -I../lib use_ok.1.t 1
perl -I../lib use_ok.2.t 1
perl -I../lib use_ok.3.t 1
-perl -I../lib version.t 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/skip_all.t
new/Test-Inter-1.09/t/skip_all.t
--- old/Test-Inter-1.07/t/skip_all.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/skip_all.t 2019-03-13 14:38:10.000000000 +0100
@@ -1,14 +1,21 @@
#!/usr/bin/perl
+use warnings 'all';
use strict;
-use warnings;
-use Test::Inter;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
-my $o = new Test::Inter;
+use Test::Inter;
+my $ti = new Test::Inter $0;
-$o->skip_all("testing skip_all");
-$o->plan(3);
-$o->_ok("Test 1");
-$o->diag("Test 1 diagnostic message");
-$o->_ok("Test 2");
-$o->_ok("Test 3");
+$ti->skip_all("testing skip_all");
+$ti->plan(3);
+$ti->_ok("Test 1");
+$ti->diag("Test 1 diagnostic message");
+$ti->_ok("Test 2");
+$ti->_ok("Test 3");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/tests.t
new/Test-Inter-1.09/t/tests.t
--- old/Test-Inter-1.07/t/tests.t 2018-03-15 19:09:05.000000000 +0100
+++ new/Test-Inter-1.09/t/tests.t 2019-03-13 14:38:14.000000000 +0100
@@ -1,7 +1,17 @@
#!/usr/bin/perl
+use warnings 'all';
+use strict;
+BEGIN {
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+}
+
use Test::Inter;
-$o = new Test::Inter;
+my $ti = new Test::Inter $0;
sub func {
my(@args) = @_;
@@ -12,7 +22,7 @@
return @ret;
}
-$o->tests(func => \&func,
+$ti->tests(func => \&func,
tests => "foo => 3
a ab => 1 2
@@ -28,7 +38,7 @@
(,a,b c) => 1 3
");
-$o->tests(func => \&func,
+$ti->tests(func => \&func,
expected => [ [1,2] ],
tests => "a ab
@@ -37,7 +47,7 @@
e ef
");
-$o->tests(func => \&func,
+$ti->tests(func => \&func,
expected => "1 2",
tests => "a ab
@@ -46,11 +56,11 @@
e ef
");
-$o->tests(tests => " '' ''
+$ti->tests(tests => " '' ''
[] []
{} {}
");
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/use_ok.1.t
new/Test-Inter-1.09/t/use_ok.1.t
--- old/Test-Inter-1.07/t/use_ok.1.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/use_ok.1.t 2019-03-13 14:38:18.000000000 +0100
@@ -1,21 +1,25 @@
#!/usr/bin/perl
+use warnings 'all';
use strict;
-use warnings;
-
-our($o);
+my $ti;
BEGIN {
- use Test::Inter;
- $o = new Test::Inter;
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+
+ use Test::Inter;
+ $ti = new Test::Inter $0;
+
+ $ti->use_ok('5.004');
+ $ti->use_ok('Config');
+ $ti->use_ok('Xxx::Yyy','forbid');
+ $ti->use_ok('Symbol','feature');
+ $ti->use_ok('Xxx::Zzz','feature');
+ $ti->use_ok('Storable',1.01);
}
-
-BEGIN { $o->use_ok('5.004'); }
-BEGIN { $o->use_ok('Config'); }
-BEGIN { $o->use_ok('Xxx::Yyy','forbid'); }
-BEGIN { $o->use_ok('Symbol','feature'); }
-BEGIN { $o->use_ok('Xxx::Zzz','feature'); }
-BEGIN { $o->use_ok('Storable',1.01); }
-
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/use_ok.2.t
new/Test-Inter-1.09/t/use_ok.2.t
--- old/Test-Inter-1.07/t/use_ok.2.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/use_ok.2.t 2019-03-13 14:38:22.000000000 +0100
@@ -1,18 +1,22 @@
#!/usr/bin/perl
+use warnings 'all';
use strict;
-use warnings;
-
-our($o);
+my $ti;
BEGIN {
- use Test::Inter;
- $o = new Test::Inter;
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+
+ use Test::Inter;
+ $ti = new Test::Inter $0;
+
+ $ti->use_ok('7.001','forbid');
+ $ti->use_ok('Config','myconfig');
+ $ti->use_ok('Storable',1.01,'dclone');
}
-
-BEGIN { $o->use_ok('7.001','forbid'); }
-BEGIN { $o->use_ok('Config','myconfig'); }
-BEGIN { $o->use_ok('Storable',1.01,'dclone'); }
-
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/use_ok.3.t
new/Test-Inter-1.09/t/use_ok.3.t
--- old/Test-Inter-1.07/t/use_ok.3.t 2014-09-10 15:46:29.000000000 +0200
+++ new/Test-Inter-1.09/t/use_ok.3.t 2019-03-13 14:38:26.000000000 +0100
@@ -1,18 +1,22 @@
#!/usr/bin/perl
+use warnings 'all';
use strict;
-use warnings;
-
-our($o);
+my $ti;
BEGIN {
- use Test::Inter;
- $o = new Test::Inter;
+ if (-d "lib") {
+ use lib "./lib";
+ } elsif (-d "../lib") {
+ use lib "../lib";
+ }
+
+ use Test::Inter;
+ $ti = new Test::Inter $0;
+
+ $ti->use_ok('7.001','forbid');
+ $ti->use_ok('Config','xxxx','forbid');
+ $ti->use_ok('Storable',7.01,'dclone','forbid');
}
-
-BEGIN { $o->use_ok('7.001','forbid'); }
-BEGIN { $o->use_ok('Config','xxxx','forbid'); }
-BEGIN { $o->use_ok('Storable',7.01,'dclone','forbid'); }
-
-$o->done_testing();
+$ti->done_testing();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Test-Inter-1.07/t/version.t
new/Test-Inter-1.09/t/version.t
--- old/Test-Inter-1.07/t/version.t 2018-03-01 15:14:28.000000000 +0100
+++ new/Test-Inter-1.09/t/version.t 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use Test::Inter;
-$o = new Test::Inter 'version', 'start' => 1;
-
-use Cwd;
-my($valid,$vers);
-
-if ($ENV{'RELEASE_TESTING'}) {
- my $dir = getcwd();
- if ($dir =~ m,(?:/|^)Test\-Inter\-(\d+\.\d+)/t,) {
- $vers = $1;
- $valid = 1;
- } else {
- $vers = 0;
- $valid = 0;
- }
-} else {
- $vers = $Test::Inter::VERSION;
- $valid = 1;
-}
-
-$o->ok($valid, "Valid directory");
-$o->ok($vers, $o->version, "Valid version");
-
-$o->done_testing();
-
