From d5f9b5715ab963b288144547862d0cf9ad820cb7 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 21 Jul 2023 15:35:01 -0400
Subject: [PATCH] Update test to closer match upstream. (#2176707)

Resolves: #2176707
---
 glibc-rh2176707-3.patch | 42 +++++++++++++++++++++++++++++++++++++++++
 glibc.spec              |  6 +++++-
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 glibc-rh2176707-3.patch

diff --git a/glibc-rh2176707-3.patch b/glibc-rh2176707-3.patch
new file mode 100644
index 0000000..0131a71
--- /dev/null
+++ b/glibc-rh2176707-3.patch
@@ -0,0 +1,42 @@
+This patch is a RHEL-only patch which modifies the custom changes
+in the previous patches in this series to make the test case look
+more like the upstream test case.
+
+diff -rup a/stdlib/tst-system.c b/stdlib/tst-system.c
+--- a/stdlib/tst-system.c	2023-07-10 13:37:53.089505036 -0400
++++ b/stdlib/tst-system.c	2023-07-10 14:04:03.922610279 -0400
+@@ -173,10 +173,10 @@ do_test (void)
+   {
+     pthread_t long_sleep_thread = xpthread_create (NULL,
+                                                    sleep_and_check_sigchld,
+-                                                   &(double) { 2 });
++                                                   &(double) { 0.2 });
+     pthread_t short_sleep_thread = xpthread_create (NULL,
+                                                     sleep_and_check_sigchld,
+-                                                    &(double) { 1 });
++                                                    &(double) { 0.1 });
+     xpthread_join (short_sleep_thread);
+     xpthread_join (long_sleep_thread);
+   }
+diff -rup a/support/shell-container.c b/support/shell-container.c
+--- a/support/shell-container.c	2023-07-10 13:37:53.089505036 -0400
++++ b/support/shell-container.c	2023-07-10 14:03:20.392920627 -0400
+@@ -182,15 +182,15 @@ sleep_func (char **argv)
+       return 1;
+     }
+   char *endptr = NULL;
+-  long sec = strtol (argv[0], &endptr, 0);
++  double sec = strtod (argv[0], &endptr);
+   if (endptr == argv[0] || errno == ERANGE || sec < 0)
+     {
+       fprintf (stderr, "sleep: invalid time interval '%s'\n", argv[0]);
+       return 1;
+     }
+-  if (sleep (sec) < 0)
++  if (usleep ((useconds_t)(sec * 1000000.0)) < 0)
+     {
+-      fprintf (stderr, "sleep: failed to nanosleep\n");
++      fprintf (stderr, "sleep: failed to usleep: %s\n", strerror (errno));
+       return 1;
+     }
+   return 0;
diff --git a/glibc.spec b/glibc.spec
index b140a0c..8d1bda9 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.28
 %define glibcversion 2.28
-%define glibcrelease 232%{?dist}
+%define glibcrelease 233%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -1042,6 +1042,7 @@ Patch849: glibc-rh2176707-1.patch
 Patch850: glibc-rh2176707-2.patch
 Patch851: glibc-rh2186781.patch
 Patch852: glibc-rh2224348.patch
+Patch853: glibc-rh2176707-3.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2872,6 +2873,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Wed Jul 26 2023 DJ Delorie <dj@redhat.com> - 2.28-233
+- Update test to closer match upstream. (#2176707)
+
 * Fri Jul 21 2023 Florian Weimer <fweimer@redhat.com> - 2.28-232
 - Make libSegFault.so NODELETE (#2224348)