The branch, dpkg-shlibdeps-buxy has been updated
via 3aea890c6528e2df0533c07a703fc22a48ea6fe2 (commit)
via e6432291b26a13b64293af6284796bfaff6afe38 (commit)
via e6dd591b64e6186724d4e652db039652299ff314 (commit)
from 097a64746d783ea7c1b669c908b478438f1e61e3 (commit)
- Shortlog ------------------------------------------------------------
3aea890 000_pod.t: Add POD syntax checking
e643229 scripts/t: Integrate more tightly into build system
e6dd591 scripts/t: Add test files to DIST
Summary of changes:
scripts/Makefile.am | 30 +++++++++++++++++--
scripts/t/000_pod.t | 11 +++++++
scripts/t/200_Dpkg_Shlibs.t | 29 ++++++++++--------
scripts/t/200_Dpkg_Shlibs/ld.so.conf | 2 +-
.../200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf | 2 +-
.../t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf | 2 +-
6 files changed, 56 insertions(+), 20 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 3aea890c6528e2df0533c07a703fc22a48ea6fe2
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Thu Sep 27 19:06:49 2007 +0200
000_pod.t: Add POD syntax checking
Standard Test::Pod testing.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4d1d97d..d3793f6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST = \
install-info.pl \
update-alternatives.pl \
changelog/debian.pl \
+ t/000_pod.t \
t/100_Dpkg_Version.t \
t/200_Dpkg_Shlibs.t \
t/200_Dpkg_Shlibs/symbols.fake-1 \
diff --git a/scripts/t/000_pod.t b/scripts/t/000_pod.t
new file mode 100644
index 0000000..dc00063
--- /dev/null
+++ b/scripts/t/000_pod.t
@@ -0,0 +1,11 @@
+# -*- mode: cperl;-*-
+
+use Test::More;
+
+use strict;
+use warnings;
+
+eval "use Test::Pod 1.00";
+plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
+my @poddirs = ( $ENV{srcdir} || '.' );
+all_pod_files_ok( all_pod_files( @poddirs ) );
commit e6432291b26a13b64293af6284796bfaff6afe38
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Sep 25 04:07:43 2007 +0200
scripts/t: Integrate more tightly into build system
rename 'test' target to 'check' so that it gets called
automatically on 'make check' and 'make distcheck'.
Also make it actually working in 'distcheck'. That part
is still a bit hacky.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 50f9dab..4d1d97d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -132,8 +132,15 @@ uninstall-local:
rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
rm -f $(DESTDIR)$(sbindir)/install-info
-TEST_FILES= t/*.t
+TEST_FILES= $(srcdir)/t/*.t
TEST_VERBOSE= 0
-test:
- PERL_DL_NONLAZY=1 $(PERL) "-MExtUtils::Command::MM" "-e"
"test_harness($(TEST_VERBOSE), '.')" $(TEST_FILES)
+clean-local:
+ chmod -R +w t.tmp
+ rm -fr t.tmp
+
+check: $(TEST_FILES) $(wildcard $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf*)
+# a bit hacky...
+ $(mkdir_p) t.tmp
+ cp -dRl $(srcdir)/t/200_Dpkg_Shlibs/ld.so.conf* t.tmp/
+ srcdir=$(srcdir) PERL_DL_NONLAZY=1 $(PERL) -I$(srcdir)
"-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '.')"
$(TEST_FILES)
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t
index 1163fdc..7a02d41 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/200_Dpkg_Shlibs.t
@@ -10,7 +10,10 @@ use_ok('Dpkg::Shlibs');
my @save_paths = @Dpkg::Shlibs::librarypaths;
@Dpkg::Shlibs::librarypaths = ();
-Dpkg::Shlibs::parse_ldso_conf("t/200_Dpkg_Shlibs/ld.so.conf");
+my $srcdir = $ENV{srcdir} || '.';
+$srcdir .= '/t/200_Dpkg_Shlibs';
+
+Dpkg::Shlibs::parse_ldso_conf("t.tmp/ld.so.conf");
use Data::Dumper;
is_deeply([qw(/nonexistant32 /nonexistant/lib64
@@ -21,8 +24,8 @@ use_ok('Dpkg::Shlibs::Objdump');
my $obj = Dpkg::Shlibs::Objdump::Object->new;
-open my $objdump, '<', "t/200_Dpkg_Shlibs/objdump.libc6-2.6"
- or die "t/200_Dpkg_Shlibs/objdump.libc6-2.6: $!";
+open my $objdump, '<', "$srcdir/objdump.libc6-2.6"
+ or die "$srcdir/objdump.libc6-2.6: $!";
$obj->_parse($objdump);
close $objdump;
@@ -55,17 +58,17 @@ is( scalar @syms, 9, 'undefined && dynamic' );
my $obj_old = Dpkg::Shlibs::Objdump::Object->new;
-open $objdump, '<', "t/200_Dpkg_Shlibs/objdump.libc6-2.3"
- or die "t/200_Dpkg_Shlibs/objdump.libc6-2.3: $!";
+open $objdump, '<', "$srcdir/objdump.libc6-2.3"
+ or die "$srcdir/objdump.libc6-2.3: $!";
$obj_old->_parse($objdump);
close $objdump;
use_ok('Dpkg::Shlibs::SymbolFile');
-my $sym_file =
Dpkg::Shlibs::SymbolFile->new("t/200_Dpkg_Shlibs/symbol_file.tmp");
-my $sym_file_dup =
Dpkg::Shlibs::SymbolFile->new("t/200_Dpkg_Shlibs/symbol_file.tmp");
-my $sym_file_old =
Dpkg::Shlibs::SymbolFile->new("t/200_Dpkg_Shlibs/symbol_file.tmp");
+my $sym_file = Dpkg::Shlibs::SymbolFile->new("$srcdir/symbol_file.tmp");
+my $sym_file_dup = Dpkg::Shlibs::SymbolFile->new("$srcdir/symbol_file.tmp");
+my $sym_file_old = Dpkg::Shlibs::SymbolFile->new("$srcdir/symbol_file.tmp");
$sym_file->merge_symbols($obj_old, "2.3.6.ds1-13");
$sym_file_old->merge_symbols($obj_old, "2.3.6.ds1-13");
@@ -92,12 +95,12 @@ my $save_file = new File::Temp;
$sym_file->save($save_file->filename);
$sym_file_dup->load($save_file->filename);
-$sym_file_dup->{file} = "t/200_Dpkg_Shlibs/symbol_file.tmp";
+$sym_file_dup->{file} = "$srcdir/symbol_file.tmp";
is_deeply($sym_file_dup, $sym_file, 'save -> load' );
# Test include mechanism of SymbolFile
-$sym_file =
Dpkg::Shlibs::SymbolFile->new("t/200_Dpkg_Shlibs/symbols.include-1");
+$sym_file = Dpkg::Shlibs::SymbolFile->new("$srcdir/symbols.include-1");
$sym = $sym_file->lookup_symbol('[EMAIL PROTECTED]', ['libfake.so.1']);
is_deeply($sym, { 'minver' => '0.9', 'dep_id' => 0, 'deprecated' => 0,
@@ -119,7 +122,7 @@ is_deeply($sym, { 'minver' => '1.1', 'dep_id' => 0,
'deprecated' => 0,
'depends' => 'libfake1 #MINVER#', 'soname' => 'libfake.so.1'
},
'overrides order with #include');
-$sym_file =
Dpkg::Shlibs::SymbolFile->new("t/200_Dpkg_Shlibs/symbols.include-2");
+$sym_file = Dpkg::Shlibs::SymbolFile->new("$srcdir/symbols.include-2");
$sym = $sym_file->lookup_symbol('[EMAIL PROTECTED]', ['libfake.so.1']);
is_deeply($sym, { 'minver' => '1.0', 'dep_id' => 1, 'deprecated' => 0,
@@ -130,8 +133,8 @@ is_deeply($sym, { 'minver' => '1.0', 'dep_id' => 1,
'deprecated' => 0,
# without versions and with visibility attribute)
$obj = Dpkg::Shlibs::Objdump::Object->new;
-open $objdump, '<', "t/200_Dpkg_Shlibs/objdump.glib-ia64"
- or die "t/200_Dpkg_Shlibs/objdump.glib-ia64: $!";
+open $objdump, '<', "$srcdir/objdump.glib-ia64"
+ or die "$srcdir/objdump.glib-ia64: $!";
$obj->_parse($objdump);
close $objdump;
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf
b/scripts/t/200_Dpkg_Shlibs/ld.so.conf
index cbbf7bd..23861b7 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf
+++ b/scripts/t/200_Dpkg_Shlibs/ld.so.conf
@@ -5,5 +5,5 @@
/nonexistant/lib64
include /nonexistant/*.conf
-include t/200_Dpkg_Shlibs/ld.so.conf.d/*.conf
+include t.tmp/ld.so.conf.d/*.conf
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
index a8e88c0..d0f90f2 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
+++ b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf
@@ -1 +1 @@
-include t/200_Dpkg_Shlibs/ld.so.conf
+include t.tmp/ld.so.conf
diff --git a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
index 8e6fe25..bcc534b 100644
--- a/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
+++ b/scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf
@@ -1 +1 @@
-include t/200_Dpkg_Shlibs/ld.so.conf_2
+include t.tmp/ld.so.conf_2
commit e6dd591b64e6186724d4e652db039652299ff314
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Tue Sep 25 04:04:09 2007 +0200
scripts/t: Add test files to DIST
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 27d8496..50f9dab 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -49,7 +49,21 @@ EXTRA_DIST = \
dpkg-statoverride.pl \
install-info.pl \
update-alternatives.pl \
- changelog/debian.pl
+ changelog/debian.pl \
+ t/100_Dpkg_Version.t \
+ t/200_Dpkg_Shlibs.t \
+ t/200_Dpkg_Shlibs/symbols.fake-1 \
+ t/200_Dpkg_Shlibs/symbols.fake-2 \
+ t/200_Dpkg_Shlibs/symbols.include-1 \
+ t/200_Dpkg_Shlibs/symbols.include-2 \
+ t/200_Dpkg_Shlibs/ld.so.conf \
+ t/200_Dpkg_Shlibs/ld.so.conf_2 \
+ t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf \
+ t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
+ t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
+ t/200_Dpkg_Shlibs/objdump.glib-ia64 \
+ t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
+ t/200_Dpkg_Shlibs/objdump.libc6-2.6
CLEANFILES = \
$(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
