From owner-svn-src-all@FreeBSD.ORG  Sat Nov  1 17:09:40 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 392261BC;
 Sat,  1 Nov 2014 17:09:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 25431CD2;
 Sat,  1 Nov 2014 17:09:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA1H9eMR030766;
 Sat, 1 Nov 2014 17:09:40 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA1H9eHd030765;
 Sat, 1 Nov 2014 17:09:40 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411011709.sA1H9eHd030765@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sat, 1 Nov 2014 17:09:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273933 - head/contrib/netbsd-tests/lib/libc/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Nov 2014 17:09:40 -0000

Author: ngie
Date: Sat Nov  1 17:09:39 2014
New Revision: 273933
URL: https://svnweb.freebsd.org/changeset/base/273933

Log:
  Don't prune duplicate services in the expected output from /etc/services on
  FreeBSD
  
  Submitted by: pho

Modified:
  head/contrib/netbsd-tests/lib/libc/net/t_servent.sh

Modified: head/contrib/netbsd-tests/lib/libc/net/t_servent.sh
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/net/t_servent.sh	Sat Nov  1 17:05:15 2014	(r273932)
+++ head/contrib/netbsd-tests/lib/libc/net/t_servent.sh	Sat Nov  1 17:09:39 2014	(r273933)
@@ -81,6 +81,24 @@ servent_body()
 		}
 	' | sort >exp
 
+	case "$(uname)" in
+	FreeBSD)
+		#  (3) Don't prune duplicates
+		tr '\t' ' ' < /etc/services |
+		    sed 's/#.*//;s/   */ /g; /^$/d;s#\([0-9]\)/#\1 #;s/ *$//' |
+		    sort |
+		    while read l; do
+			set $l
+			name=$1; shift
+			port=$1; shift
+			proto=$1; shift
+			alias="$@"
+			printf "name=%s, port=%s, proto=%s, aliases=%s\n" \
+			    $name $port $proto "$alias"
+		    done > exp
+		;;
+	esac
+
 	# run test program
 	"$(atf_get_srcdir)/h_servent" | sed 's/ *$//' | sort >out