From: Ian Jackson Date: Tue, 26 Aug 2014 22:44:52 +0000 (+0100) Subject: autopatch wip add X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=d6d53681851fb49fc5485f8f4ecaede590212abb;p=talk-2014-debconf-dgit.git autopatch wip add --- diff --git a/autopatch-bot.txt b/autopatch-bot.txt new file mode 100644 index 0000000..f83442c --- /dev/null +++ b/autopatch-bot.txt @@ -0,0 +1,105 @@ +Description: Automatically generated patch (0.11-1nmu1) + Last (up to) 3 git changes, FYI: + . + commit 85fe079e4cfabd405ca738ff8a89dfad19f17800 + Author: Ian Jackson + Date: Sat Feb 8 17:45:05 2014 +0000 + . + debian: finalise changelog for 0.11-1nmu1 + . + commit c0818e59eab55ace2b177d0ea88682c81d2830aa + Author: Ian Jackson + Date: Sat Feb 8 17:22:45 2014 +0000 + . + Tests: Sort the keywords in the graph output + . + They come out in hash order which is not necessarily stable. + Fixes FTBFS with perl 5.18 (Debian #711446, CPAN #85950). + . + Signed-off-by: Ian Jackson + . + commit bcedbb978208ce08d35e8f317fed5b34695ac1ab + Author: Ian Jackson + Date: Sat Feb 8 17:18:34 2014 +0000 + . + Tests: Provide a TestUtils.pl containing broken-out launder() function + . + The code for laundering font sizes was duplicated between the tests. + Instead, break it out into a common function launder() in a new file + t/TestUtils.pl (which exists just for the tests). + . + Signed-off-by: Ian Jackson + . + squash! Tests: Provide a Test.pm containing +Author: Ian Jackson + +--- + +--- libgraph-writer-graphviz-perl-0.11.orig/MANIFEST ++++ libgraph-writer-graphviz-perl-0.11/MANIFEST +@@ -14,3 +14,4 @@ README + t/0.use.t + t/1.simple.t + t/2.ioall.t ++t/TestUtils.pl +--- libgraph-writer-graphviz-perl-0.11.orig/t/1.simple.t ++++ libgraph-writer-graphviz-perl-0.11/t/1.simple.t +@@ -6,6 +6,7 @@ use Test::Simple tests => 1; + use IO::All; + use Graph; + use Graph::Writer::GraphViz; ++require 't/TestUtils.pl'; + + my @v = qw/Alice Bob Crude Dr/; + my $g = Graph->new; +@@ -17,9 +18,8 @@ $wr->write_graph($g,'t/graph.simple.dot' + $/ = undef; + my $g1 = ; + my $g2 = io('t/graph.simple.dot')->slurp; +-# Ignore font-sizes, it's system-dependant +-$g1 =~ s/\d+/0/g; +-$g2 =~ s/\d+/0/g; ++launder(\$g1); ++launder(\$g2); + ok($g1 eq $g2); + unlink('t/graph.simple.dot'); + +--- /dev/null ++++ libgraph-writer-graphviz-perl-0.11/t/TestUtils.pl +@@ -0,0 +1,13 @@ ++ ++sub launder ($) { ++ my ($gr) = @_; ++ # Ignore font-sizes, it's system-dependant ++ $$gr =~ s/\d+/0/g; ++ # Sort the keywords in the graph output, as they come out ++ # in hash order which isn't necessarily stable. ++ $$gr =~ s{((?:\s+.*\n)+)}{ ++ join "\n", sort split /\n/, $1 ++ }ge; ++} ++ ++1; +--- libgraph-writer-graphviz-perl-0.11.orig/t/2.ioall.t ++++ libgraph-writer-graphviz-perl-0.11/t/2.ioall.t +@@ -6,6 +6,7 @@ use Test::Simple tests => 2; + use IO::All; + use Graph; + use Graph::Writer::GraphViz; ++require 't/TestUtils.pl'; + + my @v = qw/Alice Bob Crude Dr/; + my $g = Graph->new; +@@ -25,9 +26,9 @@ $g2 = $io->slurp; + } + + ok(-f 't/graph.ioall.dot'); +-# Ignore font-sizes, it's system-dependant +-$g1 =~ s/\d+/0/g; +-$g2 =~ s/\d+/0/g; ++ ++launder(\$g1); ++launder(\$g2); + ok($g1 eq $g2); + $io->unlink; + diff --git a/autopatch-top.txt b/autopatch-top.txt new file mode 100644 index 0000000..f83442c --- /dev/null +++ b/autopatch-top.txt @@ -0,0 +1,105 @@ +Description: Automatically generated patch (0.11-1nmu1) + Last (up to) 3 git changes, FYI: + . + commit 85fe079e4cfabd405ca738ff8a89dfad19f17800 + Author: Ian Jackson + Date: Sat Feb 8 17:45:05 2014 +0000 + . + debian: finalise changelog for 0.11-1nmu1 + . + commit c0818e59eab55ace2b177d0ea88682c81d2830aa + Author: Ian Jackson + Date: Sat Feb 8 17:22:45 2014 +0000 + . + Tests: Sort the keywords in the graph output + . + They come out in hash order which is not necessarily stable. + Fixes FTBFS with perl 5.18 (Debian #711446, CPAN #85950). + . + Signed-off-by: Ian Jackson + . + commit bcedbb978208ce08d35e8f317fed5b34695ac1ab + Author: Ian Jackson + Date: Sat Feb 8 17:18:34 2014 +0000 + . + Tests: Provide a TestUtils.pl containing broken-out launder() function + . + The code for laundering font sizes was duplicated between the tests. + Instead, break it out into a common function launder() in a new file + t/TestUtils.pl (which exists just for the tests). + . + Signed-off-by: Ian Jackson + . + squash! Tests: Provide a Test.pm containing +Author: Ian Jackson + +--- + +--- libgraph-writer-graphviz-perl-0.11.orig/MANIFEST ++++ libgraph-writer-graphviz-perl-0.11/MANIFEST +@@ -14,3 +14,4 @@ README + t/0.use.t + t/1.simple.t + t/2.ioall.t ++t/TestUtils.pl +--- libgraph-writer-graphviz-perl-0.11.orig/t/1.simple.t ++++ libgraph-writer-graphviz-perl-0.11/t/1.simple.t +@@ -6,6 +6,7 @@ use Test::Simple tests => 1; + use IO::All; + use Graph; + use Graph::Writer::GraphViz; ++require 't/TestUtils.pl'; + + my @v = qw/Alice Bob Crude Dr/; + my $g = Graph->new; +@@ -17,9 +18,8 @@ $wr->write_graph($g,'t/graph.simple.dot' + $/ = undef; + my $g1 = ; + my $g2 = io('t/graph.simple.dot')->slurp; +-# Ignore font-sizes, it's system-dependant +-$g1 =~ s/\d+/0/g; +-$g2 =~ s/\d+/0/g; ++launder(\$g1); ++launder(\$g2); + ok($g1 eq $g2); + unlink('t/graph.simple.dot'); + +--- /dev/null ++++ libgraph-writer-graphviz-perl-0.11/t/TestUtils.pl +@@ -0,0 +1,13 @@ ++ ++sub launder ($) { ++ my ($gr) = @_; ++ # Ignore font-sizes, it's system-dependant ++ $$gr =~ s/\d+/0/g; ++ # Sort the keywords in the graph output, as they come out ++ # in hash order which isn't necessarily stable. ++ $$gr =~ s{((?:\s+.*\n)+)}{ ++ join "\n", sort split /\n/, $1 ++ }ge; ++} ++ ++1; +--- libgraph-writer-graphviz-perl-0.11.orig/t/2.ioall.t ++++ libgraph-writer-graphviz-perl-0.11/t/2.ioall.t +@@ -6,6 +6,7 @@ use Test::Simple tests => 2; + use IO::All; + use Graph; + use Graph::Writer::GraphViz; ++require 't/TestUtils.pl'; + + my @v = qw/Alice Bob Crude Dr/; + my $g = Graph->new; +@@ -25,9 +26,9 @@ $g2 = $io->slurp; + } + + ok(-f 't/graph.ioall.dot'); +-# Ignore font-sizes, it's system-dependant +-$g1 =~ s/\d+/0/g; +-$g2 =~ s/\d+/0/g; ++ ++launder(\$g1); ++launder(\$g2); + ok($g1 eq $g2); + $io->unlink; +