From 9149e8317f83336693fcec1be4132c5455d75d34 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Wed, 30 Sep 2015 03:22:01 +1300 Subject: [PATCH] Build results of 01f3d31 (on master) --- Changes | 4 +++ META.json | 16 ++++++------ META.yml | 12 ++++----- Makefile.PL | 2 +- lib/ELF/Extract/Sections.pm | 4 +-- lib/ELF/Extract/Sections/Meta/Scanner.pm | 4 +-- lib/ELF/Extract/Sections/Meta/Types.pm | 4 +-- lib/ELF/Extract/Sections/Scanner/Objdump.pm | 4 +-- lib/ELF/Extract/Sections/Section.pm | 4 +-- misc/Changes.deps | 4 ++- misc/Changes.deps.all | 4 ++- misc/Changes.deps.dev | 4 ++- misc/Changes.deps.opt | 4 ++- t/00-version-check.t | 27 ++++++++++++++++++--- 14 files changed, 64 insertions(+), 33 deletions(-) diff --git a/Changes b/Changes index cf36cb9..ed18e9b 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,9 @@ Revision history for ELF-Extract-Sections +1.001004 2015-09-29T14:21:04Z b0ca7c0 + [Tests] + - Try to work out what the finger prints of a system that can't handle ELF64 files looks like. + 1.001003 2015-09-27T08:06:04Z 55e4d01 [Dependencies::Stats] - Dependencies changed since 1.001002, see misc/*.deps* for details diff --git a/META.json b/META.json index 44ac346..79aa8d9 100644 --- a/META.json +++ b/META.json @@ -147,23 +147,23 @@ "provides" : { "ELF::Extract::Sections" : { "file" : "lib/ELF/Extract/Sections.pm", - "version" : "1.001003" + "version" : "1.001004" }, "ELF::Extract::Sections::Meta::Scanner" : { "file" : "lib/ELF/Extract/Sections/Meta/Scanner.pm", - "version" : "1.001003" + "version" : "1.001004" }, "ELF::Extract::Sections::Meta::Types" : { "file" : "lib/ELF/Extract/Sections/Meta/Types.pm", - "version" : "1.001003" + "version" : "1.001004" }, "ELF::Extract::Sections::Scanner::Objdump" : { "file" : "lib/ELF/Extract/Sections/Scanner/Objdump.pm", - "version" : "1.001003" + "version" : "1.001004" }, "ELF::Extract::Sections::Section" : { "file" : "lib/ELF/Extract/Sections/Section.pm", - "version" : "1.001003" + "version" : "1.001004" } }, "release_status" : "testing", @@ -178,7 +178,7 @@ "web" : "https://github.com/kentnl/ELF-Extract-Sections" } }, - "version" : "1.001003", + "version" : "1.001004", "x_BuiltWith" : { "external_file" : "misc/built_with.json" }, @@ -674,7 +674,7 @@ "branch" : null, "changelog" : "Changes", "signed" : 0, - "tag" : "1.001003-source", + "tag" : "1.001004-source", "tag_format" : "%v-source", "tag_message" : "v%v" }, @@ -765,7 +765,7 @@ "branch" : "releases", "changelog" : "Changes", "signed" : 0, - "tag" : "1.001003", + "tag" : "1.001004", "tag_format" : "%v", "tag_message" : "v%v" }, diff --git a/META.yml b/META.yml index c6aea2e..4e629c0 100644 --- a/META.yml +++ b/META.yml @@ -30,19 +30,19 @@ name: ELF-Extract-Sections provides: ELF::Extract::Sections: file: lib/ELF/Extract/Sections.pm - version: '1.001003' + version: '1.001004' ELF::Extract::Sections::Meta::Scanner: file: lib/ELF/Extract/Sections/Meta/Scanner.pm - version: '1.001003' + version: '1.001004' ELF::Extract::Sections::Meta::Types: file: lib/ELF/Extract/Sections/Meta/Types.pm - version: '1.001003' + version: '1.001004' ELF::Extract::Sections::Scanner::Objdump: file: lib/ELF/Extract/Sections/Scanner/Objdump.pm - version: '1.001003' + version: '1.001004' ELF::Extract::Sections::Section: file: lib/ELF/Extract/Sections/Section.pm - version: '1.001003' + version: '1.001004' recommends: Moose: '2.000' requires: @@ -66,4 +66,4 @@ resources: bugtracker: https://github.com/kentnl/ELF-Extract-Sections/issues homepage: https://github.com/kentnl/ELF-Extract-Sections repository: https://github.com/kentnl/ELF-Extract-Sections.git -version: '1.001003' +version: '1.001004' diff --git a/Makefile.PL b/Makefile.PL index b6e96fe..324e8bf 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -48,7 +48,7 @@ my %WriteMakefileArgs = ( "YAML::XS" => 0, "lib" => 0 }, - "VERSION" => "1.001003", + "VERSION" => "1.001004", "test" => { "TESTS" => "t/*.t t/00-compile/*.t" } diff --git a/lib/ELF/Extract/Sections.pm b/lib/ELF/Extract/Sections.pm index 32c74a0..744c650 100644 --- a/lib/ELF/Extract/Sections.pm +++ b/lib/ELF/Extract/Sections.pm @@ -6,7 +6,7 @@ package ELF::Extract::Sections; # ABSTRACT: Extract Raw Chunks of data from identifiable ELF Sections -our $VERSION = '1.001003'; # TRIAL +our $VERSION = '1.001004'; # TRIAL our $AUTHORITY = 'cpan:KENTNL'; # AUTHORITY @@ -267,7 +267,7 @@ ELF::Extract::Sections - Extract Raw Chunks of data from identifiable ELF Sectio =head1 VERSION -version 1.001003 +version 1.001004 =head1 SYNOPSIS diff --git a/lib/ELF/Extract/Sections/Meta/Scanner.pm b/lib/ELF/Extract/Sections/Meta/Scanner.pm index c4eb1a6..06edf69 100644 --- a/lib/ELF/Extract/Sections/Meta/Scanner.pm +++ b/lib/ELF/Extract/Sections/Meta/Scanner.pm @@ -6,7 +6,7 @@ package ELF::Extract::Sections::Meta::Scanner; # ABSTRACT: Interface Contract for Scanners -our $VERSION = '1.001003'; # TRIAL +our $VERSION = '1.001004'; # TRIAL our $AUTHORITY = 'cpan:KENTNL'; # AUTHORITY @@ -36,7 +36,7 @@ ELF::Extract::Sections::Meta::Scanner - Interface Contract for Scanners =head1 VERSION -version 1.001003 +version 1.001004 =head1 Required Methods for Applying Roles diff --git a/lib/ELF/Extract/Sections/Meta/Types.pm b/lib/ELF/Extract/Sections/Meta/Types.pm index ff9d56f..3721af7 100644 --- a/lib/ELF/Extract/Sections/Meta/Types.pm +++ b/lib/ELF/Extract/Sections/Meta/Types.pm @@ -6,7 +6,7 @@ package ELF::Extract::Sections::Meta::Types; # ABSTRACT: Generic Type Constraints for E:E:S -our $VERSION = '1.001003'; # TRIAL +our $VERSION = '1.001004'; # TRIAL our $AUTHORITY = 'cpan:KENTNL'; # AUTHORITY @@ -32,7 +32,7 @@ ELF::Extract::Sections::Meta::Types - Generic Type Constraints for E:E:S =head1 VERSION -version 1.001003 +version 1.001004 =head1 Types diff --git a/lib/ELF/Extract/Sections/Scanner/Objdump.pm b/lib/ELF/Extract/Sections/Scanner/Objdump.pm index 28fbd97..ba87eb5 100644 --- a/lib/ELF/Extract/Sections/Scanner/Objdump.pm +++ b/lib/ELF/Extract/Sections/Scanner/Objdump.pm @@ -6,7 +6,7 @@ package ELF::Extract::Sections::Scanner::Objdump; # ABSTRACT: An objdump based section scanner. -our $VERSION = '1.001003'; # TRIAL +our $VERSION = '1.001004'; # TRIAL our $AUTHORITY = 'cpan:KENTNL'; # AUTHORITY @@ -217,7 +217,7 @@ ELF::Extract::Sections::Scanner::Objdump - An objdump based section scanner. =head1 VERSION -version 1.001003 +version 1.001004 =head1 SYNOPSIS diff --git a/lib/ELF/Extract/Sections/Section.pm b/lib/ELF/Extract/Sections/Section.pm index 24aa460..614f0aa 100644 --- a/lib/ELF/Extract/Sections/Section.pm +++ b/lib/ELF/Extract/Sections/Section.pm @@ -6,7 +6,7 @@ package ELF::Extract::Sections::Section; # ABSTRACT: An Objective reference to a section in an ELF file. -our $VERSION = '1.001003'; # TRIAL +our $VERSION = '1.001004'; # TRIAL our $AUTHORITY = 'cpan:KENTNL'; # AUTHORITY @@ -189,7 +189,7 @@ ELF::Extract::Sections::Section - An Objective reference to a section in an ELF =head1 VERSION -version 1.001003 +version 1.001004 =head1 SYNOPSIS diff --git a/misc/Changes.deps b/misc/Changes.deps index 38eeae8..337f728 100644 --- a/misc/Changes.deps +++ b/misc/Changes.deps @@ -1,6 +1,8 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test) -1.001003 +1.001004 + +1.001003 2015-09-27T08:06:04Z [Added / runtime requires] - Capture::Tiny diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all index 0febc9c..0342d86 100644 --- a/misc/Changes.deps.all +++ b/misc/Changes.deps.all @@ -1,6 +1,8 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop) -1.001003 +1.001004 + +1.001003 2015-09-27T08:06:04Z [Added / runtime requires] - Capture::Tiny diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev index 0c55574..d1b55ec 100644 --- a/misc/Changes.deps.dev +++ b/misc/Changes.deps.dev @@ -1,6 +1,8 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL ) -1.001003 +1.001004 + +1.001003 2015-09-27T08:06:04Z 1.001002 2015-09-27T07:39:23Z diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt index a7a7458..c546577 100644 --- a/misc/Changes.deps.opt +++ b/misc/Changes.deps.opt @@ -1,6 +1,8 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test) -1.001003 +1.001004 + +1.001003 2015-09-27T08:06:04Z 1.001002 2015-09-27T07:39:23Z diff --git a/t/00-version-check.t b/t/00-version-check.t index 4a04ec7..87f8b38 100644 --- a/t/00-version-check.t +++ b/t/00-version-check.t @@ -31,20 +31,39 @@ unless ( ok( $path, "objdump is available" ) ) { } ok( $gotoutput, "objdump --version emitted data" ); } +my $help_out; { my ( $stdout, $stderr, $exit ) = capture { system("objdump --help") }; - cmp_ok( $exit, '==', 0, "objdump exited with 0" ); + my $ok = cmp_ok( $exit, '==', 0, "objdump exited with 0" ); if ( unlike( $stdout, qr/^\s*$/, "objdump --help emitted data to STDOUT" ) ) { + $help_out = $stdout; + $ok = undef unless like( $stdout, qr/-D,\s*--disassemble-all/, "has -D param" ); + $ok = undef unless like( $stdout, qr/-F,\s*--file-offsets/, "has -F param" ); + + diag "STDOUT: ---\n" . $stdout unless $ok; + } + elsif ( $stderr !~ /^\s*$/ ) { + diag "STDERR: ---\n" . $stderr; + } +} +{ + my ( $stdout, $stderr, $exit ) = capture { system("objdump -f t/test_files/libz.so.1.2.3.debug") }; - my $ok = like( $stdout, qr/-D,\s*--disassemble-all/, "has -D param" ); - $ok = undef unless like( $stdout, qr/-F,\s*--file-offsets/, "has -F param" ); + my $ok = cmp_ok( $exit, '==', 0, 'objdump exited with 0' ); + if ( unlike( $stdout, qr/^\s*$/, "objdump -f emitted data to STDOUT" ) ) { + + $ok = undef unless like( $stdout, qr/elf64-x86-64/, "Id's elf64-x86-64" ); diag "STDOUT: ---\n" . $stdout unless $ok; } elsif ( $stderr !~ /^\s*$/ ) { - diag "STDERR: ---\n"; + $ok = undef; + diag "STDERR: ---\n" . $stderr; + } + if ( not $ok and $help_out ) { + diag "HELP OUT: ---\n$help_out"; } }