From owner-svn-src-all@freebsd.org  Sun Mar 12 04:08:38 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 286A3D08E07;
 Sun, 12 Mar 2017 04:08:38 +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 E9A1E1608;
 Sun, 12 Mar 2017 04:08:37 +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 v2C48bAr033263;
 Sun, 12 Mar 2017 04:08:37 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2C48adc033262;
 Sun, 12 Mar 2017 04:08:36 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703120408.v2C48adc033262@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Sun, 12 Mar 2017 04:08:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315108 - head/usr.bin/xinstall/tests
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Mar 2017 04:08:38 -0000

Author: ngie
Date: Sun Mar 12 04:08:36 2017
New Revision: 315108
URL: https://svnweb.freebsd.org/changeset/base/315108

Log:
  Restore some of the error message text accidentally removed in r315098
  
  "unexpected symlink contents" is more pedantically correct than
  "unexpected symlink".
  
  MFC after:	1 week
  X-MFC with:	r315098
  Sponsored by:	Dell EMC Isilon

Modified:
  head/usr.bin/xinstall/tests/install_test.sh

Modified: head/usr.bin/xinstall/tests/install_test.sh
==============================================================================
--- head/usr.bin/xinstall/tests/install_test.sh	Sun Mar 12 04:04:16 2017	(r315107)
+++ head/usr.bin/xinstall/tests/install_test.sh	Sun Mar 12 04:08:36 2017	(r315108)
@@ -286,7 +286,7 @@ symbolic_link_absolute_body() {
 	copyf_path=$(readlink copyf)
 	testf_path="$(pwd -P)/testf"
 	if [ "$copyf_path" != "$testf_path" ]; then
-		atf_fail "unexpected symlink ('$copyf_path' != '$testf_path')"
+		atf_fail "unexpected symlink contents ('$copyf_path' != '$testf_path')"
 	fi
 }
 
@@ -299,7 +299,7 @@ symbolic_link_relative_body() {
 	copyf_path=$(readlink copyf)
 	testf_path="testf"
 	if [ "$copyf_path" != "$testf_path" ]; then
-		atf_fail "unexpected symlink ('$copyf_path' != '$testf_path')"
+		atf_fail "unexpected symlink contents ('$copyf_path' != '$testf_path')"
 	fi
 }