diff options
Diffstat (limited to 'meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff')
-rw-r--r-- | meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff b/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff new file mode 100644 index 0000000000..2c30536120 --- /dev/null +++ b/meta/recipes-devtools/perl/perl-5.14.3/debian/skip-upstream-git-tests.diff | |||
@@ -0,0 +1,60 @@ | |||
1 | Upstream-Status:Inappropriate [debian patches] | ||
2 | From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001 | ||
3 | From: Niko Tyni <ntyni@debian.org> | ||
4 | Date: Fri, 22 Apr 2011 11:15:32 +0300 | ||
5 | Subject: Skip tests specific to the upstream Git repository | ||
6 | |||
7 | These tests fail if run from a different git repository than | ||
8 | upstream. This complicates things needlessly for downstream packagers. | ||
9 | |||
10 | Skip the tests altogether even if the .git directory exists. | ||
11 | |||
12 | Patch-Name: debian/skip-upstream-git-tests.diff | ||
13 | --- | ||
14 | t/porting/authors.t | 3 ++- | ||
15 | t/porting/cmp_version.t | 3 ++- | ||
16 | t/porting/manifest.t | 3 ++- | ||
17 | 3 files changed, 6 insertions(+), 3 deletions(-) | ||
18 | |||
19 | diff --git a/t/porting/authors.t b/t/porting/authors.t | ||
20 | index 28ca1ca..3c7f069 100644 | ||
21 | --- a/t/porting/authors.t | ||
22 | +++ b/t/porting/authors.t | ||
23 | @@ -9,7 +9,8 @@ BEGIN { | ||
24 | use strict; | ||
25 | use warnings; | ||
26 | |||
27 | -if (! -d '.git' ) { | ||
28 | +# Debian change: skip as we're probably in a different git repository | ||
29 | +if (1 || ! -d '.git' ) { | ||
30 | print "1..0 # SKIP: not being run from a git checkout\n"; | ||
31 | exit 0; | ||
32 | } | ||
33 | diff --git a/t/porting/cmp_version.t b/t/porting/cmp_version.t | ||
34 | index b3c677c..f89f2a7 100644 | ||
35 | --- a/t/porting/cmp_version.t | ||
36 | +++ b/t/porting/cmp_version.t | ||
37 | @@ -25,7 +25,8 @@ use File::Spec::Functions qw(rel2abs abs2rel catfile catdir curdir); | ||
38 | use Getopt::Std; | ||
39 | use Maintainers; | ||
40 | |||
41 | -if (! -d '.git' ) { | ||
42 | +# Debian change: skip as we're probably in a different git repository | ||
43 | +if (1 || ! -d '.git' ) { | ||
44 | print "1..0 # SKIP: not being run from a git checkout\n"; | ||
45 | exit 0; | ||
46 | } | ||
47 | diff --git a/t/porting/manifest.t b/t/porting/manifest.t | ||
48 | index 48dd3ac..b08126b 100644 | ||
49 | --- a/t/porting/manifest.t | ||
50 | +++ b/t/porting/manifest.t | ||
51 | @@ -59,7 +59,8 @@ SKIP: { | ||
52 | |||
53 | SKIP: { | ||
54 | chdir ".."; | ||
55 | - skip("not under git control", 3) unless -d '.git'; | ||
56 | + # Debian change: skip as we're probably in a different git repository | ||
57 | + skip("not under git control", 3) unless 0 && -d '.git'; | ||
58 | chomp(my @repo= grep { !/\.gitignore$/ } `git ls-files`); | ||
59 | skip("git ls-files didnt work",3) | ||
60 | if !@repo; | ||