mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #2732: fix vfs test build failure on alpha

Browse Source 
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>
This commit is contained in:
Sergei Trofimovich 2012-02-13 14:14:50 +03:00
parent 76c572c676
commit 83563af6f7
1 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
tests/lib/vfs/vfs_parse_ls_lga.c
View File

@ -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
);