diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2013-12-13 03:37:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-14 09:11:19 +0000 |
commit | ab0c7af8f971a0846a4a6c7fb07f1c17e7c96604 (patch) | |
tree | f2077a5d17a3a86d7bab47cc2faa36a318eef3d9 /meta/recipes-extended/ltp | |
parent | ab8027396b416c465541b8b2ef1b1ada4c19eb26 (diff) | |
download | poky-ab0c7af8f971a0846a4a6c7fb07f1c17e7c96604.tar.gz |
ltp: Use patch generated without -M
* in my builds both versions worked, but Saul reported that it fails to
apply with:
Applying patch
0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch
patch: **** Only garbage was found in the patch input.
Now I've see the same issue on different builder (with Ubuntu 12.04).
(From OE-Core rev: ebc4c7384c7a355165838ee0935b986840f950e5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp')
-rw-r--r-- | meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch | 190 |
1 files changed, 177 insertions, 13 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch index 74abe564e1..1b4d2324a5 100644 --- a/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch +++ b/meta/recipes-extended/ltp/ltp/0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch | |||
@@ -19,20 +19,184 @@ Upstream-Status: Pending | |||
19 | 19 | ||
20 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 20 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
21 | --- | 21 | --- |
22 | .../kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} | 0 | 22 | .../kernel/containers/sysvipc/runipctests_noltp.sh | 31 ++++++++++++++++ |
23 | .../kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} | 0 | 23 | .../kernel/containers/sysvipc/runtests_noltp.sh | 31 ---------------- |
24 | 2 files changed, 0 insertions(+), 0 deletions(-) | 24 | .../kernel/containers/utsname/runtests_noltp.sh | 41 ---------------------- |
25 | rename testcases/kernel/containers/sysvipc/{runtests_noltp.sh => runipctests_noltp.sh} (100%) | 25 | .../kernel/containers/utsname/runutstests_noltp.sh | 41 ++++++++++++++++++++++ |
26 | rename testcases/kernel/containers/utsname/{runtests_noltp.sh => runutstests_noltp.sh} (100%) | 26 | 4 files changed, 72 insertions(+), 72 deletions(-) |
27 | create mode 100644 testcases/kernel/containers/sysvipc/runipctests_noltp.sh | ||
28 | delete mode 100644 testcases/kernel/containers/sysvipc/runtests_noltp.sh | ||
29 | delete mode 100755 testcases/kernel/containers/utsname/runtests_noltp.sh | ||
30 | create mode 100755 testcases/kernel/containers/utsname/runutstests_noltp.sh | ||
27 | 31 | ||
28 | diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh | 32 | diff --git a/testcases/kernel/containers/sysvipc/runipctests_noltp.sh b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh |
29 | similarity index 100% | 33 | new file mode 100644 |
30 | rename from testcases/kernel/containers/sysvipc/runtests_noltp.sh | 34 | index 0000000..84f398f |
31 | rename to testcases/kernel/containers/sysvipc/runipctests_noltp.sh | 35 | --- /dev/null |
32 | diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh | 36 | +++ b/testcases/kernel/containers/sysvipc/runipctests_noltp.sh |
33 | similarity index 100% | 37 | @@ -0,0 +1,31 @@ |
34 | rename from testcases/kernel/containers/utsname/runtests_noltp.sh | 38 | +#!/bin/sh |
35 | rename to testcases/kernel/containers/utsname/runutstests_noltp.sh | 39 | +################################################################################ |
40 | +## ## | ||
41 | +## Copyright (c) International Business Machines Corp., 2007 ## | ||
42 | +## ## | ||
43 | +## This program is free software; you can redistribute it and#or modify ## | ||
44 | +## it under the terms of the GNU General Public License as published by ## | ||
45 | +## the Free Software Foundation; either version 2 of the License, or ## | ||
46 | +## (at your option) any later version. ## | ||
47 | +## ## | ||
48 | +## This program is distributed in the hope that it will be useful, but ## | ||
49 | +## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## | ||
50 | +## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## | ||
51 | +## for more details. ## | ||
52 | +## ## | ||
53 | +## You should have received a copy of the GNU General Public License ## | ||
54 | +## along with this program; if not, write to the Free Software ## | ||
55 | +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## | ||
56 | +## ## | ||
57 | +################################################################################ | ||
58 | + | ||
59 | +exit_code=0 | ||
60 | +echo "sysvipc tests" | ||
61 | +for type in none clone unshare; do | ||
62 | + echo "**sysvipc $type" | ||
63 | + ./shmnstest_noltp $type | ||
64 | + if [ $? -ne 0 ]; then | ||
65 | + exit_code=$? | ||
66 | + fi | ||
67 | +done | ||
68 | +exit $exit_code | ||
69 | diff --git a/testcases/kernel/containers/sysvipc/runtests_noltp.sh b/testcases/kernel/containers/sysvipc/runtests_noltp.sh | ||
70 | deleted file mode 100644 | ||
71 | index 84f398f..0000000 | ||
72 | --- a/testcases/kernel/containers/sysvipc/runtests_noltp.sh | ||
73 | +++ /dev/null | ||
74 | @@ -1,31 +0,0 @@ | ||
75 | -#!/bin/sh | ||
76 | -################################################################################ | ||
77 | -## ## | ||
78 | -## Copyright (c) International Business Machines Corp., 2007 ## | ||
79 | -## ## | ||
80 | -## This program is free software; you can redistribute it and#or modify ## | ||
81 | -## it under the terms of the GNU General Public License as published by ## | ||
82 | -## the Free Software Foundation; either version 2 of the License, or ## | ||
83 | -## (at your option) any later version. ## | ||
84 | -## ## | ||
85 | -## This program is distributed in the hope that it will be useful, but ## | ||
86 | -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## | ||
87 | -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## | ||
88 | -## for more details. ## | ||
89 | -## ## | ||
90 | -## You should have received a copy of the GNU General Public License ## | ||
91 | -## along with this program; if not, write to the Free Software ## | ||
92 | -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## | ||
93 | -## ## | ||
94 | -################################################################################ | ||
95 | - | ||
96 | -exit_code=0 | ||
97 | -echo "sysvipc tests" | ||
98 | -for type in none clone unshare; do | ||
99 | - echo "**sysvipc $type" | ||
100 | - ./shmnstest_noltp $type | ||
101 | - if [ $? -ne 0 ]; then | ||
102 | - exit_code=$? | ||
103 | - fi | ||
104 | -done | ||
105 | -exit $exit_code | ||
106 | diff --git a/testcases/kernel/containers/utsname/runtests_noltp.sh b/testcases/kernel/containers/utsname/runtests_noltp.sh | ||
107 | deleted file mode 100755 | ||
108 | index 43cb7e2..0000000 | ||
109 | --- a/testcases/kernel/containers/utsname/runtests_noltp.sh | ||
110 | +++ /dev/null | ||
111 | @@ -1,41 +0,0 @@ | ||
112 | -#!/bin/sh | ||
113 | -################################################################################ | ||
114 | -## ## | ||
115 | -## Copyright (c) International Business Machines Corp., 2007 ## | ||
116 | -## ## | ||
117 | -## This program is free software; you can redistribute it and#or modify ## | ||
118 | -## it under the terms of the GNU General Public License as published by ## | ||
119 | -## the Free Software Foundation; either version 2 of the License, or ## | ||
120 | -## (at your option) any later version. ## | ||
121 | -## ## | ||
122 | -## This program is distributed in the hope that it will be useful, but ## | ||
123 | -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## | ||
124 | -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## | ||
125 | -## for more details. ## | ||
126 | -## ## | ||
127 | -## You should have received a copy of the GNU General Public License ## | ||
128 | -## along with this program; if not, write to the Free Software ## | ||
129 | -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## | ||
130 | -## ## | ||
131 | -################################################################################ | ||
132 | - | ||
133 | -oldhostname=`hostname` | ||
134 | -exit_code=0 | ||
135 | -echo "unshare tests" | ||
136 | -for i in `seq 1 5`; do | ||
137 | - echo "test $i (unshare)" | ||
138 | - ./utstest_noltp unshare $i | ||
139 | - if [ $? -ne 0 ]; then | ||
140 | - exit_code=$? | ||
141 | - fi | ||
142 | -done | ||
143 | -echo "clone tests" | ||
144 | -for i in `seq 1 5`; do | ||
145 | - echo "test $i (clone)" | ||
146 | - ./utstest_noltp clone $i | ||
147 | - if [ $? -ne 0 ]; then | ||
148 | - exit_code=$? | ||
149 | - fi | ||
150 | -done | ||
151 | -hostname "$oldhostname" | ||
152 | -exit $exit_code | ||
153 | diff --git a/testcases/kernel/containers/utsname/runutstests_noltp.sh b/testcases/kernel/containers/utsname/runutstests_noltp.sh | ||
154 | new file mode 100755 | ||
155 | index 0000000..43cb7e2 | ||
156 | --- /dev/null | ||
157 | +++ b/testcases/kernel/containers/utsname/runutstests_noltp.sh | ||
158 | @@ -0,0 +1,41 @@ | ||
159 | +#!/bin/sh | ||
160 | +################################################################################ | ||
161 | +## ## | ||
162 | +## Copyright (c) International Business Machines Corp., 2007 ## | ||
163 | +## ## | ||
164 | +## This program is free software; you can redistribute it and#or modify ## | ||
165 | +## it under the terms of the GNU General Public License as published by ## | ||
166 | +## the Free Software Foundation; either version 2 of the License, or ## | ||
167 | +## (at your option) any later version. ## | ||
168 | +## ## | ||
169 | +## This program is distributed in the hope that it will be useful, but ## | ||
170 | +## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## | ||
171 | +## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## | ||
172 | +## for more details. ## | ||
173 | +## ## | ||
174 | +## You should have received a copy of the GNU General Public License ## | ||
175 | +## along with this program; if not, write to the Free Software ## | ||
176 | +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## | ||
177 | +## ## | ||
178 | +################################################################################ | ||
179 | + | ||
180 | +oldhostname=`hostname` | ||
181 | +exit_code=0 | ||
182 | +echo "unshare tests" | ||
183 | +for i in `seq 1 5`; do | ||
184 | + echo "test $i (unshare)" | ||
185 | + ./utstest_noltp unshare $i | ||
186 | + if [ $? -ne 0 ]; then | ||
187 | + exit_code=$? | ||
188 | + fi | ||
189 | +done | ||
190 | +echo "clone tests" | ||
191 | +for i in `seq 1 5`; do | ||
192 | + echo "test $i (clone)" | ||
193 | + ./utstest_noltp clone $i | ||
194 | + if [ $? -ne 0 ]; then | ||
195 | + exit_code=$? | ||
196 | + fi | ||
197 | +done | ||
198 | +hostname "$oldhostname" | ||
199 | +exit $exit_code | ||
36 | -- | 200 | -- |
37 | 1.8.4.3 | 201 | 1.8.4.3 |
38 | 202 | ||