svn commit: r312301 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc

[Ngie Cooper]

Author: ngie
Date: Mon Jan 16 18:36:38 2017
New Revision: 312301
URL: https://svnweb.freebsd.org/changeset/base/312301

Log:
  Diff reduce with upstream by using macros and logic integrated in
  later revisions of the test

Modified:
  projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c

Modified: projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
==============================================================================
--- projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c	Mon Jan 16 18:17:53 2017	(r312300)
+++ projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c	Mon Jan 16 18:36:38 2017	(r312301)
@@ -24,13 +24,6 @@ __RCSID("$NetBSD: t_rpc.c,v 1.10 2016/08
 	return ev;					\
 } while(/*CONSTCOND*/0)
 
-#ifdef __FreeBSD__
-#define SKIPXI(ev, msg, ...)	do {			\
-	atf_tc_skip(msg, __VA_ARGS__);			\
-	return ev;					\
-} while(/*CONSTCOND*/0)
-#endif
-
 #else
 #define ERRX(ev, msg, ...)	errx(EXIT_FAILURE, msg, __VA_ARGS__)
 #define SKIPX(ev, msg, ...)	errx(EXIT_FAILURE, msg, __VA_ARGS__)
@@ -196,7 +189,7 @@ regtest(const char *hostname, const char
 #endif
 	if (!svc_create(server, PROGNUM, VERSNUM, transp))
 	{
-		SKIPXI(EXIT_FAILURE, "Cannot create server %d", num);
+		SKIPX(EXIT_FAILURE, "Cannot create server %d", num);
 	}
 
 	switch ((pid = fork())) {