summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch42
1 files changed, 22 insertions, 20 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch b/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
index e7c927e116..9244a06b44 100644
--- a/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
+++ b/meta/recipes-extended/ltp/ltp/0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch
@@ -21,16 +21,18 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21 1 file changed, 52 insertions(+), 40 deletions(-) 21 1 file changed, 52 insertions(+), 40 deletions(-)
22 22
23diff --git a/testcases/commands/ar/ar01 b/testcases/commands/ar/ar01 23diff --git a/testcases/commands/ar/ar01 b/testcases/commands/ar/ar01
24index ddab2e0..d688f76 100644 24index be105f6da..813a51d9c 100644
25--- a/testcases/commands/ar/ar01 25--- a/testcases/commands/ar/ar01
26+++ b/testcases/commands/ar/ar01 26+++ b/testcases/commands/ar/ar01
27@@ -23,14 +23,26 @@ 27@@ -24,16 +24,28 @@
28 # This is a basic ar command test.
29 # 28 #
29 AR="${AR:=ar}"
30 TST_CNT=17 30 TST_CNT=17
31+TST_SETUP=setup 31+TST_SETUP=setup
32 TST_TESTFUNC=test 32 TST_TESTFUNC=test
33 TST_NEEDS_TMPDIR=1 33 TST_NEEDS_TMPDIR=1
34 TST_NEEDS_CMDS="$AR"
35
34 . tst_test.sh 36 . tst_test.sh
35 37
36+setup() 38+setup()
@@ -53,7 +55,7 @@ index ddab2e0..d688f76 100644
53 ROD ar -t lib.a \> ar.out 55 ROD ar -t lib.a \> ar.out
54 56
55 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 57 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
56@@ -47,9 +59,9 @@ test1() 58@@ -50,9 +62,9 @@ test1()
57 59
58 test2() 60 test2()
59 { 61 {
@@ -66,7 +68,7 @@ index ddab2e0..d688f76 100644
66 ROD ar -t lib.a \> ar.out 68 ROD ar -t lib.a \> ar.out
67 69
68 printf "file1.in\nfile4.in\nfile2.in\nfile3.in\n" > ar.exp 70 printf "file1.in\nfile4.in\nfile2.in\nfile3.in\n" > ar.exp
69@@ -66,8 +78,8 @@ test2() 71@@ -69,8 +81,8 @@ test2()
70 72
71 test3() 73 test3()
72 { 74 {
@@ -77,7 +79,7 @@ index ddab2e0..d688f76 100644
77 ROD ar -t lib.a \> ar.out 79 ROD ar -t lib.a \> ar.out
78 80
79 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 81 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
80@@ -84,9 +96,9 @@ test3() 82@@ -87,9 +99,9 @@ test3()
81 83
82 test4() 84 test4()
83 { 85 {
@@ -90,7 +92,7 @@ index ddab2e0..d688f76 100644
90 ROD ar -t lib.a \> ar.out 92 ROD ar -t lib.a \> ar.out
91 93
92 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 94 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
93@@ -103,7 +115,7 @@ test4() 95@@ -106,7 +118,7 @@ test4()
94 96
95 test5() 97 test5()
96 { 98 {
@@ -99,7 +101,7 @@ index ddab2e0..d688f76 100644
99 101
100 if [ -s ar.out ]; then 102 if [ -s ar.out ]; then
101 tst_res TFAIL "ar produced output unexpectedly (-c)" 103 tst_res TFAIL "ar produced output unexpectedly (-c)"
102@@ -117,7 +129,7 @@ test5() 104@@ -120,7 +132,7 @@ test5()
103 105
104 test6() 106 test6()
105 { 107 {
@@ -108,7 +110,7 @@ index ddab2e0..d688f76 100644
108 110
109 if [ -s ar.out ]; then 111 if [ -s ar.out ]; then
110 tst_res TFAIL "ar produced output unexpectedly (-qc)" 112 tst_res TFAIL "ar produced output unexpectedly (-qc)"
111@@ -131,9 +143,9 @@ test6() 113@@ -134,9 +146,9 @@ test6()
112 114
113 test7() 115 test7()
114 { 116 {
@@ -121,7 +123,7 @@ index ddab2e0..d688f76 100644
121 ROD ar -t lib.a \> ar.out 123 ROD ar -t lib.a \> ar.out
122 124
123 printf "file3.in\n" > ar.exp 125 printf "file3.in\n" > ar.exp
124@@ -150,9 +162,9 @@ test7() 126@@ -153,9 +165,9 @@ test7()
125 127
126 test8() 128 test8()
127 { 129 {
@@ -134,7 +136,7 @@ index ddab2e0..d688f76 100644
134 ROD ar -t lib.a \> ar.out 136 ROD ar -t lib.a \> ar.out
135 137
136 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 138 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
137@@ -169,8 +181,8 @@ test8() 139@@ -172,8 +184,8 @@ test8()
138 140
139 test9() 141 test9()
140 { 142 {
@@ -145,7 +147,7 @@ index ddab2e0..d688f76 100644
145 ROD ar -t lib.a \> ar.out 147 ROD ar -t lib.a \> ar.out
146 148
147 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 149 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
148@@ -187,9 +199,9 @@ test9() 150@@ -190,9 +202,9 @@ test9()
149 151
150 test10() 152 test10()
151 { 153 {
@@ -158,7 +160,7 @@ index ddab2e0..d688f76 100644
158 ROD ar -t lib.a \> ar.out 160 ROD ar -t lib.a \> ar.out
159 161
160 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 162 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
161@@ -206,9 +218,9 @@ test10() 163@@ -209,9 +221,9 @@ test10()
162 164
163 test11() 165 test11()
164 { 166 {
@@ -171,7 +173,7 @@ index ddab2e0..d688f76 100644
171 ROD ar -t lib.a \> ar.out 173 ROD ar -t lib.a \> ar.out
172 174
173 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp 175 printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
174@@ -225,9 +237,9 @@ test11() 176@@ -228,9 +240,9 @@ test11()
175 177
176 test12() 178 test12()
177 { 179 {
@@ -184,7 +186,7 @@ index ddab2e0..d688f76 100644
184 186
185 printf "This is file one\nThis is file two\nThis is file three\n" > ar.exp 187 printf "This is file one\nThis is file two\nThis is file three\n" > ar.exp
186 188
187@@ -244,9 +256,9 @@ test12() 189@@ -247,9 +259,9 @@ test12()
188 test13() 190 test13()
189 { 191 {
190 192
@@ -197,7 +199,7 @@ index ddab2e0..d688f76 100644
197 ROD ar -t lib.a \> ar.out 199 ROD ar -t lib.a \> ar.out
198 200
199 printf "file1.in\nfile2.in\nfile3.in\nfile4.in\n" > ar.exp 201 printf "file1.in\nfile2.in\nfile3.in\nfile4.in\n" > ar.exp
200@@ -264,14 +276,14 @@ test13() 202@@ -267,14 +279,14 @@ test13()
201 test14() 203 test14()
202 { 204 {
203 ROD touch file0.in 205 ROD touch file0.in
@@ -214,7 +216,7 @@ index ddab2e0..d688f76 100644
214 216
215 file0_mtime2=$(ar -tv lib.a | grep file0.in) 217 file0_mtime2=$(ar -tv lib.a | grep file0.in)
216 file1_mtime2=$(ar -tv lib.a | grep file1.in) 218 file1_mtime2=$(ar -tv lib.a | grep file1.in)
217@@ -293,7 +305,7 @@ test14() 219@@ -296,7 +308,7 @@ test14()
218 220
219 test15() 221 test15()
220 { 222 {
@@ -223,7 +225,7 @@ index ddab2e0..d688f76 100644
223 ROD ar -tv lib.a \> ar.out 225 ROD ar -tv lib.a \> ar.out
224 226
225 if grep -q '[rwx-]\{9\} [0-9].*/[0-9].*\s*[0-9].*.*file1.in' ar.out; then 227 if grep -q '[rwx-]\{9\} [0-9].*/[0-9].*\s*[0-9].*.*file1.in' ar.out; then
226@@ -308,9 +320,9 @@ test15() 228@@ -311,9 +323,9 @@ test15()
227 229
228 test16() 230 test16()
229 { 231 {
@@ -236,7 +238,7 @@ index ddab2e0..d688f76 100644
236 238
237 printf "x - file1.in\nx - file2.in\nx - file3.in\n" > ar.exp 239 printf "x - file1.in\nx - file2.in\nx - file3.in\n" > ar.exp
238 240
239@@ -332,8 +344,8 @@ test16() 241@@ -335,8 +347,8 @@ test16()
240 242
241 test17() 243 test17()
242 { 244 {
@@ -248,5 +250,5 @@ index ddab2e0..d688f76 100644
248 printf "x - file2.in\n" > ar.exp 250 printf "x - file2.in\n" > ar.exp
249 251
250-- 252--
2512.7.4 2532.19.0.rc2
252 254