mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 18:23:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

test-recurse-dir: work around nftw() ignoring symlinks()

Browse Source 
We have a test where we compare the results from nftw() and our own
resurce_dit_at(). nftw() skips a dangling symlink when running under mkosi and
the test fails. I don't understand why nftw() does that, but in our code we
don't need to test and care about the details of nftw(), which we don't use,
outside of the one test, so let's just skip symlinks in the test.

Closes #29603.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-10-19 16:46:56 +02:00 committed by Luca Boccassi
parent f5a7476677
commit 974959e6f6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/test-recurse-dir.c
View File

@ -26,8 +26,7 @@ static int nftw_cb(
break;
case FTW_SL:
log_debug("ftw found symlink %s", fpath);
assert_se(strv_extendf(&list_nftw, "%s→", fpath) >= 0);
log_debug("ftw found symlink %s, ignoring.", fpath);
break;
case FTW_D:
@ -71,11 +70,10 @@ static int recurse_dir_callback(
case RECURSE_DIR_ENTRY:
assert_se(!IN_SET(de->d_type, DT_UNKNOWN, DT_DIR));
log_debug("found %s", path);
log_debug("found %s%s", path,
de->d_type == DT_LNK ? ", ignoring." : "");
if (de->d_type == DT_LNK)
assert_se(strv_extendf(l, "%s→", path) >= 0);
else
if (de->d_type != DT_LNK)
assert_se(strv_extend(l, path) >= 0);
break;
@ -131,7 +129,10 @@ int main(int argc, char *argv[]) {
else
p = "/usr/share/man"; /* something hopefully reasonably stable while we run (and limited in size) */
/* Enumerate the specified dirs in full, once via nftw(), and once via recurse_dir(), and ensure the results are identical */
/* Enumerate the specified dirs in full, once via nftw(), and once via recurse_dir(), and ensure the
* results are identical. nftw() sometimes skips symlinks (see
* https://github.com/systemd/systemd/issues/29603), so ignore them to avoid bogus errors. */
t1 = now(CLOCK_MONOTONIC);
r = recurse_dir_at(AT_FDCWD, p, 0, UINT_MAX, RECURSE_DIR_SORT|RECURSE_DIR_ENSURE_TYPE|RECURSE_DIR_SAME_MOUNT, recurse_dir_callback, &list_recurse_dir);
t2 = now(CLOCK_MONOTONIC);