← Back to branch summary

~ubuntu-branches/ubuntu/wily/keyutils/wily

« back to all changes in this revision

Viewing changes to debian/patches/0009-Use-bash-to-execute-the-tests.patch

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-10-16 11:45:19 UTC
  • mfrom: (1.1.7) (10.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20141016114519-cqt8zwrg92c31m31
Tags: 1.5.9-5ubuntu1
https://launchpad.net/bugs/1381973
Disable the tests, hanging on the distro buildd kernels (12.04 LTS).
Verified that the tests succeed with the 14.04 LTS kernels.
Addresses: LP: #1381973.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0009-Use-bash-to-execute-the-tests.patch
 
1
From: Christian Kastner <debian@kvr.at>
 
2
Date: Sun, 25 May 2014 00:52:58 +0200
 
3
Subject: Use bash to execute the tests
 
4
 
 
5
The test fixtures are full of bashisms. Getting rid of them should be discussed
 
6
with upstream first.
 
7
 
 
8
Forwarded: not-needed
 
9
Last-Update: 2014-07-26
 
10
---
 
11
 tests/prepare.inc.sh | 2 +-
 
12
 tests/runtest.sh     | 2 +-
 
13
 2 files changed, 2 insertions(+), 2 deletions(-)
 
14
 
 
15
Index: pkg-keyutils/tests/prepare.inc.sh
 
16
===================================================================
 
17
--- pkg-keyutils.orig/tests/prepare.inc.sh
 
18
+++ pkg-keyutils/tests/prepare.inc.sh
 
19
@@ -4,7 +4,7 @@
 
20
 if [ "x`keyctl rdescribe @s | sed 's/.*;//'`" != "xRHTS/keyctl/$$" ]
 
21
 then
 
22
     echo "Running with session keyring RHTS/keyctl/$$"
 
23
-    exec keyctl session "RHTS/keyctl/$$" sh $0 $@ || exit 8
 
24
+    exec keyctl session "RHTS/keyctl/$$" bash $0 $@ || exit 8
 
25
 fi
 
26
 
 
27
 # Set up for the Red Hat Test System
 
28
Index: pkg-keyutils/tests/runtest.sh
 
29
===================================================================
 
30
--- pkg-keyutils.orig/tests/runtest.sh
 
31
+++ pkg-keyutils/tests/runtest.sh
 
32
@@ -13,7 +13,7 @@ fi
 
33
 for i in ${TESTS}; do
 
34
        export TEST=$i
 
35
         cd $i
 
36
-       sh ./runtest.sh || exit 1
 
37
+       bash ./runtest.sh || exit 1
 
38
        cd ${OLDPWD}
 
39
 done
 
40