From owner-svn-src-projects@freebsd.org Mon Jan 16 18:36:39 2017 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9EDDCB261E for ; Mon, 16 Jan 2017 18:36:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9BD521B63; Mon, 16 Jan 2017 18:36:39 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0GIacP0092067; Mon, 16 Jan 2017 18:36:38 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0GIac6Z092066; Mon, 16 Jan 2017 18:36:38 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201701161836.v0GIac6Z092066@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Ngie Cooper Date: Mon, 16 Jan 2017 18:36:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r312301 - projects/netbsd-tests-upstream-01-2017/contrib/netbsd-tests/lib/libc/rpc X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2017 18:36:39 -0000 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())) {