Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Nov 2014 17:09:40 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
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
Message-ID:  <201411011709.sA1H9eHd030765@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411011709.sA1H9eHd030765>