GNU C Library master sources branch master updated. glibc-2.29.9000-159-g82849fd

[azanella at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  82849fde3b8cb9b9396fa8cadf842dc2b1d2cced (commit)
       via  7a773abf7c91f74fdc1866951e123e68713e88e1 (commit)
      from  d7563e6277ee9c0b6936debd4a6c9a910105b68a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=82849fde3b8cb9b9396fa8cadf842dc2b1d2cced

commit 82849fde3b8cb9b9396fa8cadf842dc2b1d2cced
Author: Mike Crowe <mcrowe@brightsign.biz>
Date:   Mon Mar 25 09:29:50 2019 -0300

    nptl/tst-rwlock14: Test pthread_rwlock_timedwrlock correctly

diff --git a/ChangeLog b/ChangeLog
index 4fcf7db..0f4d746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2019-03-25  Mike Crowe  <mac@mcrowe.com>
 
+	* nptl/tst-rwlock14.c (do_test): Replace duplicate calls to
+	pthread_rwlock_timedrdlock with calls to
+	pthread_rwlock_timedwrlock to ensure that the latter is tested
+	too. Use new function name in diagnostic messages too.
+
 	* nptl/tst-sem5.c: Remove unused headers. Add <support/check.h>.
 	(do_test) Use libsupport test macros rather than hand-coded
 	conditionals and error messages. Ensure that sem_init returns zero
diff --git a/nptl/tst-rwlock14.c b/nptl/tst-rwlock14.c
index f8c2183..6f57169 100644
--- a/nptl/tst-rwlock14.c
+++ b/nptl/tst-rwlock14.c
@@ -117,15 +117,15 @@ do_test (void)
       result = 1;
     }
 
-  e = pthread_rwlock_timedrdlock (&r, &ts);
+  e = pthread_rwlock_timedwrlock (&r, &ts);
   if (e == 0)
     {
-      puts ("second rwlock_timedrdlock did not fail");
+      puts ("second rwlock_timedwrlock did not fail");
       result = 1;
     }
   else if (e != EINVAL)
     {
-      puts ("second rwlock_timedrdlock did not return EINVAL");
+      puts ("second rwlock_timedwrlock did not return EINVAL");
       result = 1;
     }
 
@@ -145,15 +145,15 @@ do_test (void)
       result = 1;
     }
 
-  e = pthread_rwlock_timedrdlock (&r, &ts);
+  e = pthread_rwlock_timedwrlock (&r, &ts);
   if (e == 0)
     {
-      puts ("third rwlock_timedrdlock did not fail");
+      puts ("third rwlock_timedwrlock did not fail");
       result = 1;
     }
   else if (e != EINVAL)
     {
-      puts ("third rwlock_timedrdlock did not return EINVAL");
+      puts ("third rwlock_timedwrlock did not return EINVAL");
       result = 1;
     }
 

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7a773abf7c91f74fdc1866951e123e68713e88e1

commit 7a773abf7c91f74fdc1866951e123e68713e88e1
Author: Mike Crowe <mcrowe@brightsign.biz>
Date:   Mon Mar 25 09:28:18 2019 -0300

    nptl: Convert tst-sem5 & tst-sem13 to use libsupport
    
    Checked on x86_64-linux-gnu and i686-linux-gnu.
    
    	* nptl/tst-sem5.c: Remove unused headers. Add <support/check.h>.
    	(do_test) Use libsupport test macros rather than hand-coded
    	conditionals and error messages. Ensure that sem_init returns zero
    	rather than not -1. Use <support/test-driver.c> rather than
    	test-skeleton.c.
    
    	* nptl/tst-sem13.c: Add <support/check.h>. (do_test) Use libsupport
    	test macros rather than hand-coded conditionals and error messages.
    	Use <support/test-driver.c> rather than test-skeleton.c.

diff --git a/ChangeLog b/ChangeLog
index 2e8ed59..4fcf7db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2019-03-25  Mike Crowe  <mac@mcrowe.com>
+
+	* nptl/tst-sem5.c: Remove unused headers. Add <support/check.h>.
+	(do_test) Use libsupport test macros rather than hand-coded
+	conditionals and error messages. Ensure that sem_init returns zero
+	rather than not -1. Use <support/test-driver.c> rather than
+	test-skeleton.c.
+
+	* nptl/tst-sem13.c: Add <support/check.h>. (do_test) Use libsupport
+	test macros rather than hand-coded conditionals and error messages.
+	Use <support/test-driver.c> rather than test-skeleton.c.
+
 2019-03-25  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/gnu/netinet/udp.h (UDP_GRO): New macro.
diff --git a/nptl/tst-sem13.c b/nptl/tst-sem13.c
index 1560e91..28d37ed 100644
--- a/nptl/tst-sem13.c
+++ b/nptl/tst-sem13.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <internaltypes.h>
+#include <support/check.h>
 
 
 static int
@@ -15,61 +16,33 @@ do_test (void)
     struct new_sem ns;
   } u;
 
-  if (sem_init (&u.s, 0, 0) != 0)
-    {
-      puts ("sem_init failed");
-      return 1;
-    }
+  TEST_COMPARE (sem_init (&u.s, 0, 0), 0);
 
   struct timespec ts = { 0, 1000000001 };	/* Invalid.  */
   errno = 0;
-  if (sem_timedwait (&u.s, &ts) >= 0)
-    {
-      puts ("sem_timedwait did not fail");
-      return 1;
-    }
-  if (errno != EINVAL)
-    {
-      perror ("sem_timedwait did not fail with EINVAL");
-      return 1;
-    }
+  TEST_VERIFY_EXIT (sem_timedwait (&u.s, &ts) < 0);
+  TEST_COMPARE (errno, EINVAL);
+
 #if __HAVE_64B_ATOMICS
   unsigned int nwaiters = (u.ns.data >> SEM_NWAITERS_SHIFT);
 #else
   unsigned int nwaiters = u.ns.nwaiters;
 #endif
-  if (nwaiters != 0)
-    {
-      printf ("sem_timedwait modified nwaiters: %d\n", nwaiters);
-      return 1;
-    }
+  TEST_COMPARE (nwaiters, 0);
 
   ts.tv_sec = /* Invalid.  */ -2;
   ts.tv_nsec = 0;
   errno = 0;
-  if (sem_timedwait (&u.s, &ts) >= 0)
-    {
-      puts ("2nd sem_timedwait did not fail");
-      return 1;
-    }
-  if (errno != ETIMEDOUT)
-    {
-      perror ("2nd sem_timedwait did not fail with ETIMEDOUT");
-      return 1;
-    }
+  TEST_VERIFY_EXIT (sem_timedwait (&u.s, &ts) < 0);
+  TEST_COMPARE (errno, ETIMEDOUT);
 #if __HAVE_64B_ATOMICS
   nwaiters = (u.ns.data >> SEM_NWAITERS_SHIFT);
 #else
   nwaiters = u.ns.nwaiters;
 #endif
-  if (nwaiters != 0)
-    {
-      printf ("2nd sem_timedwait modified nwaiters: %d\n", nwaiters);
-      return 1;
-    }
+  TEST_COMPARE (nwaiters, 0);
 
   return 0;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c
index 2149ade..50ab6f9 100644
--- a/nptl/tst-sem5.c
+++ b/nptl/tst-sem5.c
@@ -18,10 +18,10 @@
 
 #include <errno.h>
 #include <semaphore.h>
-#include <stdio.h>
 #include <time.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <support/check.h>
 
 
 static int
@@ -31,23 +31,9 @@ do_test (void)
   struct timespec ts;
   struct timeval tv;
 
-  if (sem_init (&s, 0, 1) == -1)
-    {
-      puts ("sem_init failed");
-      return 1;
-    }
-
-  if (TEMP_FAILURE_RETRY (sem_wait (&s)) == -1)
-    {
-      puts ("sem_wait failed");
-      return 1;
-    }
-
-  if (gettimeofday (&tv, NULL) != 0)
-    {
-      puts ("gettimeofday failed");
-      return 1;
-    }
+  TEST_COMPARE (sem_init (&s, 0, 1), 0);
+  TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0);
+  TEST_COMPARE (gettimeofday (&tv, NULL), 0);
 
   TIMEVAL_TO_TIMESPEC (&tv, &ts);
 
@@ -60,34 +46,16 @@ do_test (void)
     }
 
   errno = 0;
-  if (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)) != -1)
-    {
-      puts ("sem_timedwait succeeded");
-      return 1;
-    }
-  if (errno != ETIMEDOUT)
-    {
-      printf ("sem_timedwait return errno = %d instead of ETIMEDOUT\n",
-	      errno);
-      return 1;
-    }
+  TEST_COMPARE (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)), -1);
+  TEST_COMPARE (errno, ETIMEDOUT);
 
   struct timespec ts2;
-  if (clock_gettime (CLOCK_REALTIME, &ts2) != 0)
-    {
-      puts ("clock_gettime failed");
-      return 1;
-    }
+  TEST_COMPARE (clock_gettime (CLOCK_REALTIME, &ts2), 0);
 
-  if (ts2.tv_sec < ts.tv_sec
-      || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec < ts.tv_nsec))
-    {
-      puts ("timeout too short");
-      return 1;
-    }
+  TEST_VERIFY (ts2.tv_sec > ts.tv_sec
+               || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec > ts.tv_nsec));
 
   return 0;
 }
 
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   17 ++++++++++++++++
 nptl/tst-rwlock14.c |   12 +++++-----
 nptl/tst-sem13.c    |   47 +++++++++------------------------------------
 nptl/tst-sem5.c     |   52 +++++++++-----------------------------------------
 4 files changed, 43 insertions(+), 85 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources