svn commit: r312150 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/librt

[Ngie Cooper]

Author: ngie
Date: Sat Jan 14 09:42:06 2017
New Revision: 312150
URL: https://svnweb.freebsd.org/changeset/base/312150

Log:
  Use cleanup routines to remove POSIX semaphores instead of just blindly
  unlinking them at the beginning of the testcase
  
  This is a lot more intelligent in cleaning up the semaphores if the testcase
  fails before sem_unlink is called.
  
  Contributed back as bin/51872 upstream.

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/librt/t_sem.c

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/librt/t_sem.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/librt/t_sem.c	Sat Jan 14 09:38:40 2017	(r312149)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/librt/t_sem.c	Sat Jan 14 09:42:06 2017	(r312150)
@@ -72,7 +72,7 @@ __RCSID("$NetBSD: t_sem.c,v 1.2 2010/11/
 
 #define NCHILDREN 10
 
-ATF_TC(basic);
+ATF_TC_WITH_CLEANUP(basic);
 ATF_TC_HEAD(basic, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks basic functionality of POSIX "
@@ -86,9 +86,6 @@ ATF_TC_BODY(basic, tc)
 	if (sysconf(_SC_SEMAPHORES) == -1)
 		atf_tc_skip("POSIX semaphores not supported");
 
-#ifdef __FreeBSD__
-	sem_unlink("/sem_b");
-#endif
 	sem_b = sem_open("/sem_b", O_CREAT | O_EXCL, 0644, 0);
 	ATF_REQUIRE(sem_b != SEM_FAILED);
 
@@ -111,8 +108,12 @@ ATF_TC_BODY(basic, tc)
 	ATF_REQUIRE_EQ(sem_close(sem_b), 0);
 	ATF_REQUIRE_EQ(sem_unlink("/sem_b"), 0);
 }
+ATF_TC_CLEANUP(basic, tc)
+{
+	(void)sem_unlink("/sem_b");
+}
 
-ATF_TC(child);
+ATF_TC_WITH_CLEANUP(child);
 ATF_TC_HEAD(child, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks using semaphores to synchronize "
@@ -127,12 +128,9 @@ ATF_TC_BODY(child, tc)
 
 	pid_t pid;
 
-	if (sysconf(_SC_SEMAPHORES) == -1)         
+	if (sysconf(_SC_SEMAPHORES) == -1)
 		atf_tc_skip("POSIX semaphores not supported");
 
-#ifdef __FreeBSD__
-	sem_unlink("/sem_a");
-#endif
 	sem_a = sem_open("/sem_a", O_CREAT | O_EXCL, 0644, 0);
 	ATF_REQUIRE(sem_a != SEM_FAILED);
 
@@ -170,6 +168,10 @@ ATF_TC_BODY(child, tc)
 	ATF_REQUIRE_EQ(sem_close(sem_a), 0);
 	ATF_REQUIRE_EQ(sem_unlink("/sem_a"), 0);
 }
+ATF_TC_CLEANUP(child, tc)
+{
+	(void)sem_unlink("/sem_a");
+}
 
 ATF_TP_ADD_TCS(tp)
 {