rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Adjust support/tst-support_descriptors for running under Konflux

Browse Source 
Resolves: RHEL-152856
This commit is contained in:
Florian Weimer 2026-05-04 17:20:06 +02:00 committed by Arjun Shankar
parent 3e2740ab95
commit 3dec37a49a
1 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
glibc-RHEL-152856.patch Normal file
View File

@ -0,0 +1,72 @@
commit 55873e86e1861ffe010a83455ac7eb5df239ec3e
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon May 4 17:18:38 2026 +0200
support: Improve tst-support_descriptors compatibility with containers
If /dev/null is bind-mounted, /dev and /dev/null are on different
devices, so the expected failure has an additional line describe
the device change.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
diff --git a/support/tst-support_descriptors.c b/support/tst-support_descriptors.c
index 97d7284c69..d25cb7d67a 100644
--- a/support/tst-support_descriptors.c
+++ b/support/tst-support_descriptors.c
@@ -128,21 +128,48 @@ test_run (void)
support_capture_subprocess_free (&proc);
free (expected);
- expected = xasprintf ("\nDifferences:\n"
- "error: descriptor %d changed from \"/dev/null\""
- " to \"/dev\"\n"
- "error: descriptor %d changed ino ",
- free_descriptor, free_descriptor);
good = good && !support_record_failure_is_failed ();
proc = support_capture_subprocess (&subprocess_changed_descriptor, NULL);
good = good && support_record_failure_is_failed ();
support_record_failure_reset (); /* Discard the reported error. */
report_subprocess_output ("subprocess_changed_descriptor", &proc);
- TEST_VERIFY (strstr (proc.out.buffer, expected) != NULL);
+
+ expected = xasprintf ("\nDifferences:\n"
+ "error: descriptor %d changed from \"/dev/null\""
+ " to \"/dev\"\n"
+ "error: descriptor %d changed ino ",
+ free_descriptor, free_descriptor);
+ if (strstr (proc.out.buffer, expected) != NULL)
+ {
+ /* No change of device. */
+ free (expected);
+ }
+ else
+ {
+ /* The device changed in addition to the inode number. This
+ happens if /dev/null is bind-mounted from another file
+ system, so that /dev is on a difference device. */
+ expected = xasprintf ("\nDifferences:\n"
+ "error: descriptor %d changed from \"/dev/null\""
+ " to \"/dev\"\n"
+ "error: descriptor %d changed device ",
+ free_descriptor, free_descriptor);
+ TEST_VERIFY (strstr (proc.out.buffer, expected) != NULL);
+ free (expected);
+
+ /* We assume that the inode number changes, although in theory
+ it is possible that the directory happens to have the same
+ inode number as the null device because it is on a different
+ file system. */
+ expected = xasprintf ("\nerror: descriptor %d changed ino ",
+ free_descriptor);
+ TEST_VERIFY (strstr (proc.out.buffer, expected) != NULL);
+ free (expected);
+ }
+
support_capture_subprocess_check (&proc, "subprocess_changed_descriptor",
0, sc_allow_stdout);
support_capture_subprocess_free (&proc);
- free (expected);
}
static int