diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-10-19 14:53:17 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-24 17:27:14 +0100 |
commit | 5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f (patch) | |
tree | 5b7867dec533d001ce29d8bf7b4869299cea254f /meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff | |
parent | 53f7342562a66d1b14ecee234aa76be07951dedc (diff) | |
download | poky-5f8f114e4cc29e96942f96ef7dec6d25e18b6d4f.tar.gz |
perl: upgrade from 5.12.3 to 5.14.2
parallel build fix patches are not needed as they are upstream now.
Got a new set of debian patch set for 5.14.2
perl-rpdepends: fix the autogenerated rdepends mistakes
take out some mdoules which are not going to be built.
[Saul Wold: Remove debug]
(From OE-Core rev: 8dc5f118832a4aca906239ffed82f72497c37f8e)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff new file mode 100644 index 0000000000..a157bc7f60 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff | |||
@@ -0,0 +1,59 @@ | |||
1 | From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Niko Tyni <ntyni@debian.org> | ||
3 | Date: Fri, 22 Apr 2011 11:15:32 +0300 | ||
4 | Subject: Skip tests specific to the upstream Git repository | ||
5 | |||
6 | These tests fail if run from a different git repository than | ||
7 | upstream. This complicates things needlessly for downstream packagers. | ||
8 | |||
9 | Skip the tests altogether even if the .git directory exists. | ||
10 | |||
11 | Patch-Name: debian/skip-upstream-git-tests.diff | ||
12 | --- | ||
13 | t/porting/authors.t | 3 ++- | ||
14 | t/porting/cmp_version.t | 3 ++- | ||
15 | t/porting/manifest.t | 3 ++- | ||
16 | 3 files changed, 6 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/t/porting/authors.t b/t/porting/authors.t | ||
19 | index 28ca1ca..3c7f069 100644 | ||
20 | --- a/t/porting/authors.t | ||
21 | +++ b/t/porting/authors.t | ||
22 | @@ -9,7 +9,8 @@ BEGIN { | ||
23 | use strict; | ||
24 | use warnings; | ||
25 | |||
26 | -if (! -d '.git' ) { | ||
27 | +# Debian change: skip as we're probably in a different git repository | ||
28 | +if (1 || ! -d '.git' ) { | ||
29 | print "1..0 # SKIP: not being run from a git checkout\n"; | ||
30 | exit 0; | ||
31 | } | ||
32 | diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t | ||
33 | index b3c677c..f89f2a7 100644 | ||
34 | --- a/t/porting/cmp_version.t | ||
35 | +++ b/t/porting/cmp_version.t | ||
36 | @@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir); | ||
37 | use Getopt::Std; | ||
38 | use Maintainers; | ||
39 | |||
40 | -if (! -d '.git' ) { | ||
41 | +# Debian change: skip as we're probably in a different git repository | ||
42 | +if (1 || ! -d '.git' ) { | ||
43 | print "1..0 # SKIP: not being run from a git checkout\n"; | ||
44 | exit 0; | ||
45 | } | ||
46 | diff --git a/t/porting/manifest.t b/t/porting/manifest.t | ||
47 | index 48dd3ac..b08126b 100644 | ||
48 | --- a/t/porting/manifest.t | ||
49 | +++ b/t/porting/manifest.t | ||
50 | @@ -59,7 +59,8 @@ SKIP: { | ||
51 | |||
52 | SKIP: { | ||
53 | chdir ".."; | ||
54 | - skip("not under git control", 3) unless -d '.git'; | ||
55 | + # Debian change: skip as we're probably in a different git repository | ||
56 | + skip("not under git control", 3) unless 0 && -d '.git'; | ||
57 | chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`); | ||
58 | skip("git ls-files didnt work",3) | ||
59 | if !@repo; | ||