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
|
commit 931819039e78d7b1465077709988a611df4752c2
Author: Sergei Trofimovich <slyfox@gentoo.org>
Date: Mon Feb 13 14:14:50 2012 +0300
Ticket #2732: fix vfs test build failure on alpha
The test fails to compile on alpha:
> CC vfs_parse_ls_lga.o
> vfs_parse_ls_lga.c: In function ‘test_vfs_parse_ls_lga’:
> vfs_parse_ls_lga.c:174:9: error: unknown field ‘st_atime’ specified in initializer
> vfs_parse_ls_lga.c:175:9: error: unknown field ‘st_mtime’ specified in initializer
as st_atime on alpha in not just a field name:
struct stat {
...
__extension__ union { struct timespec st_atim; struct { __time_t st_atime; unsigned long st_atimensec; }; };
__extension__ union { struct timespec st_mtim; struct { __time_t st_mtime; unsigned long st_mtimensec; }; };
__extension__ union { struct timespec st_ctim; struct { __time_t st_ctime; unsigned long st_ctimensec; }; };
};
The fix switches to old-style struct initialization.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
diff --git a/tests/lib/vfs/vfs_parse_ls_lga.c b/tests/lib/vfs/vfs_parse_ls_lga.c
index f44559d..d16711e 100644
--- a/tests/lib/vfs/vfs_parse_ls_lga.c
+++ b/tests/lib/vfs/vfs_parse_ls_lga.c
@@ -155,90 +155,88 @@ START_TEST (test_vfs_parse_ls_lga)
{
size_t filepos = 0;
+ struct stat etalon_stat;
+
+ etalon_stat.st_dev = 0;
+ etalon_stat.st_ino = 0;
+ etalon_stat.st_mode = 0x41fd;
+ etalon_stat.st_nlink = 10;
+ etalon_stat.st_uid = 500;
+ etalon_stat.st_gid = 500;
+ etalon_stat.st_rdev = 0;
+ etalon_stat.st_size = 4096;
+ etalon_stat.st_blksize = 512;
+ etalon_stat.st_blocks = 8;
+ etalon_stat.st_atime = 1308838140;
+ etalon_stat.st_mtime = 1308838140;
+ etalon_stat.st_ctime = 1308838140;
+
vfs_parse_ls_lga_init();
check_vfs_parse_ls_lga_call(
"drwxrwxr-x 10 500 500 4096 Jun 23 17:09 build_root",
- 1, "build_root", NULL, (struct stat)
- {
- .st_dev = 0,
- .st_ino = 0,
- .st_mode = 0x41fd,
- .st_nlink = 10,
- .st_uid = 500,
- .st_gid = 500,
- .st_rdev = 0,
- .st_size = 4096,
- .st_blksize = 512,
- .st_blocks = 8,
- .st_atime = 1308838140,
- .st_mtime = 1308838140,
- .st_ctime = 1308838140
- },
+ 1, "build_root", NULL, etalon_stat,
NULL
);
+ etalon_stat.st_dev = 0;
+ etalon_stat.st_ino = 0;
+ etalon_stat.st_mode = 0xa1ff;
+ etalon_stat.st_nlink = 10;
+ etalon_stat.st_uid = 500;
+ etalon_stat.st_gid = 500;
+ etalon_stat.st_rdev = 0;
+ etalon_stat.st_size = 11;
+ etalon_stat.st_blksize = 512;
+ etalon_stat.st_blocks = 1;
+ etalon_stat.st_atime = 1268431200;
+ etalon_stat.st_mtime = 1268431200;
+ etalon_stat.st_ctime = 1268431200;
+
check_vfs_parse_ls_lga_call(
"lrwxrwxrwx 1 500 500 11 Mar 13 2010 COPYING -> doc/COPYING",
- 1, "COPYING", "doc/COPYING",
- (struct stat)
- {
- .st_dev = 0,
- .st_ino = 0,
- .st_mode = 0xa1ff,
- .st_nlink = 10,
- .st_uid = 500,
- .st_gid = 500,
- .st_rdev = 0,
- .st_size = 11,
- .st_blksize = 512,
- .st_blocks = 1,
- .st_atime = 1268431200,
- .st_mtime = 1268431200,
- .st_ctime = 1268431200
- },
+ 1, "COPYING", "doc/COPYING", etalon_stat,
NULL
);
+ etalon_stat.st_dev = 0;
+ etalon_stat.st_ino = 0;
+ etalon_stat.st_mode = 0x41fd;
+ etalon_stat.st_nlink = 10;
+ etalon_stat.st_uid = 500;
+ etalon_stat.st_gid = 500;
+ etalon_stat.st_rdev = 0;
+ etalon_stat.st_size = 4096;
+ etalon_stat.st_blksize = 512;
+ etalon_stat.st_blocks = 8;
+ etalon_stat.st_atime = 1308838140;
+ etalon_stat.st_mtime = 1308838140;
+ etalon_stat.st_ctime = 1308838140;
+
check_vfs_parse_ls_lga_call(
"drwxrwxr-x 10 500 500 4096 Jun 23 17:09 ..",
- 1, "..", NULL, (struct stat)
- {
- .st_dev = 0,
- .st_ino = 0,
- .st_mode = 0x41fd,
- .st_nlink = 10,
- .st_uid = 500,
- .st_gid = 500,
- .st_rdev = 0,
- .st_size = 4096,
- .st_blksize = 512,
- .st_blocks = 8,
- .st_atime = 1308838140,
- .st_mtime = 1308838140,
- .st_ctime = 1308838140
- },
+ 1, "..", NULL, etalon_stat,
&filepos
);
+
+ etalon_stat.st_dev = 0;
+ etalon_stat.st_ino = 0;
+ etalon_stat.st_mode = 0x41fd;
+ etalon_stat.st_nlink = 10;
+ etalon_stat.st_uid = 500;
+ etalon_stat.st_gid = 500;
+ etalon_stat.st_rdev = 0;
+ etalon_stat.st_size = 4096;
+ etalon_stat.st_blksize = 512;
+ etalon_stat.st_blocks = 8;
+ etalon_stat.st_atime = 1308838140;
+ etalon_stat.st_mtime = 1308838140;
+ etalon_stat.st_ctime = 1308838140;
+
check_vfs_parse_ls_lga_call(
"drwxrwxr-x 10 500 500 4096 Jun 23 17:09 build_root",
- 1, "build_root", NULL, (struct stat)
- {
- .st_dev = 0,
- .st_ino = 0,
- .st_mode = 0x41fd,
- .st_nlink = 10,
- .st_uid = 500,
- .st_gid = 500,
- .st_rdev = 0,
- .st_size = 4096,
- .st_blksize = 512,
- .st_blocks = 8,
- .st_atime = 1308838140,
- .st_mtime = 1308838140,
- .st_ctime = 1308838140
- },
+ 1, "build_root", NULL, etalon_stat,
&filepos
);
|
GitWeb