1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
From 04da9478887e705ea38e4f097492da20e651686c Mon Sep 17 00:00:00 2001
From: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
Date: Wed, 13 Sep 2017 15:48:42 +0800
Subject: [PATCH] commands/ar01: Fix for test in deterministic mode
If binutils was configured with --enable-deterministic-archives,
ar will run in deterministic mode by default, and use zero for
timestamps and uids/gids, which makes the test case abnormal.
Fix this by add the "U" modifier when deterministic mode is default.
Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
Signed-off-by: Fei Jie <feij.fnst@cn.fujitsu.com>
Upstream-Status: Backport
[http://lists.linux.it/pipermail/ltp/2017-September/005668.html]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
testcases/commands/ar/ar01 | 92 ++++++++++++++++++++++++++--------------------
1 file changed, 52 insertions(+), 40 deletions(-)
diff --git a/testcases/commands/ar/ar01 b/testcases/commands/ar/ar01
index be105f6da..813a51d9c 100644
--- a/testcases/commands/ar/ar01
+++ b/testcases/commands/ar/ar01
@@ -24,16 +24,28 @@
#
AR="${AR:=ar}"
TST_CNT=17
+TST_SETUP=setup
TST_TESTFUNC=test
TST_NEEDS_TMPDIR=1
TST_NEEDS_CMDS="$AR"
. tst_test.sh
+setup()
+{
+ ar --help | grep "use zero for timestamps and uids/gids (default)" \
+ >/dev/null
+ if [ $? -eq 0 ]; then
+ MOD="U"
+ else
+ MOD=""
+ fi
+}
+
test1()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
- ROD ar -ra file1.in lib.a $TST_DATAROOT/file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
+ ROD ar -ra"$MOD" file1.in lib.a $TST_DATAROOT/file2.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -50,9 +62,9 @@ test1()
test2()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in $TST_DATAROOT/file4.in
- ROD ar -ma file1.in lib.a file4.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in $TST_DATAROOT/file4.in
+ ROD ar -ma"$MOD" file1.in lib.a file4.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile4.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -69,8 +81,8 @@ test2()
test3()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
- ROD ar -rb file3.in lib.a $TST_DATAROOT/file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
+ ROD ar -rb"$MOD" file3.in lib.a $TST_DATAROOT/file2.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -87,9 +99,9 @@ test3()
test4()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
- $TST_DATAROOT/file2.in
- ROD ar -mb file3.in lib.a file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
+ $TST_DATAROOT/file2.in
+ ROD ar -mb"$MOD" file3.in lib.a file2.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -106,7 +118,7 @@ test4()
test5()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in \> ar.out
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in \> ar.out
if [ -s ar.out ]; then
tst_res TFAIL "ar produced output unexpectedly (-c)"
@@ -120,7 +132,7 @@ test5()
test6()
{
- ROD ar -qc lib.a $TST_DATAROOT/file1.in \> ar.out
+ ROD ar -qc"$MOD" lib.a $TST_DATAROOT/file1.in \> ar.out
if [ -s ar.out ]; then
tst_res TFAIL "ar produced output unexpectedly (-qc)"
@@ -134,9 +146,9 @@ test6()
test7()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in
- ROD ar -d lib.a file1.in file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in
+ ROD ar -d"$MOD" lib.a file1.in file2.in
ROD ar -t lib.a \> ar.out
printf "file3.in\n" > ar.exp
@@ -153,9 +165,9 @@ test7()
test8()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in
- ROD ar -d lib.a
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in
+ ROD ar -d"$MOD" lib.a
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -172,8 +184,8 @@ test8()
test9()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
- ROD ar -ri file3.in lib.a $TST_DATAROOT/file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in
+ ROD ar -ri"$MOD" file3.in lib.a $TST_DATAROOT/file2.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -190,9 +202,9 @@ test9()
test10()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
- $TST_DATAROOT/file2.in
- ROD ar -mi file3.in lib.a file2.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
+ $TST_DATAROOT/file2.in
+ ROD ar -mi"$MOD" file3.in lib.a file2.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -209,9 +221,9 @@ test10()
test11()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
- $TST_DATAROOT/file2.in
- ROD ar -m lib.a file3.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file3.in \
+ $TST_DATAROOT/file2.in
+ ROD ar -m"$MOD" lib.a file3.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\n" > ar.exp
@@ -228,9 +240,9 @@ test11()
test12()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in
- ROD ar -p lib.a \> ar.out
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in
+ ROD ar -p"$MOD" lib.a \> ar.out
printf "This is file one\nThis is file two\nThis is file three\n" > ar.exp
@@ -247,9 +259,9 @@ test12()
test13()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in
- ROD ar -q lib.a $TST_DATAROOT/file4.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in
+ ROD ar -q"$MOD" lib.a $TST_DATAROOT/file4.in
ROD ar -t lib.a \> ar.out
printf "file1.in\nfile2.in\nfile3.in\nfile4.in\n" > ar.exp
@@ -267,14 +279,14 @@ test13()
test14()
{
ROD touch file0.in
- ROD ar -cr lib.a file0.in $TST_DATAROOT/file1.in
+ ROD ar -cr"$MOD" lib.a file0.in $TST_DATAROOT/file1.in
file0_mtime1=$(ar -tv lib.a | grep file0.in)
file1_mtime1=$(ar -tv lib.a | grep file1.in)
touch -c -t $(date --date='next day' +"%Y%m%d%H%M") file0.in
- ROD ar -ru lib.a file0.in $TST_DATAROOT/file1.in
+ ROD ar -ru"$MOD" lib.a file0.in $TST_DATAROOT/file1.in
file0_mtime2=$(ar -tv lib.a | grep file0.in)
file1_mtime2=$(ar -tv lib.a | grep file1.in)
@@ -296,7 +308,7 @@ test14()
test15()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in
ROD ar -tv lib.a \> ar.out
if grep -q '[rwx-]\{9\} [0-9].*/[0-9].*\s*[0-9].*.*file1.in' ar.out; then
@@ -311,9 +323,9 @@ test15()
test16()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
- $TST_DATAROOT/file3.in
- ROD ar -xv lib.a \> ar.out
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in \
+ $TST_DATAROOT/file3.in
+ ROD ar -xv"$MOD" lib.a \> ar.out
printf "x - file1.in\nx - file2.in\nx - file3.in\n" > ar.exp
@@ -335,8 +347,8 @@ test16()
test17()
{
- ROD ar -cr lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in
- ROD ar -xv lib.a file2.in \> ar.out
+ ROD ar -cr"$MOD" lib.a $TST_DATAROOT/file1.in $TST_DATAROOT/file2.in
+ ROD ar -xv"$MOD" lib.a file2.in \> ar.out
printf "x - file2.in\n" > ar.exp
--
2.19.0.rc2
|
