From owner-svn-src-all@freebsd.org  Fri Jun 30 23:53:41 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 70676D9DE45;
 Fri, 30 Jun 2017 23:53:41 +0000 (UTC)
 (envelope-from phil@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 3DE4483294;
 Fri, 30 Jun 2017 23:53:41 +0000 (UTC)
 (envelope-from phil@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5UNreZJ090806;
 Fri, 30 Jun 2017 23:53:40 GMT (envelope-from phil@FreeBSD.org)
Received: (from phil@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5UNreVP090805;
 Fri, 30 Jun 2017 23:53:40 GMT (envelope-from phil@FreeBSD.org)
Message-Id: <201706302353.v5UNreVP090805@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: phil set sender to
 phil@FreeBSD.org using -f
From: Phil Shafer <phil@FreeBSD.org>
Date: Fri, 30 Jun 2017 23:53:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320521 - head/lib/libxo/tests
X-SVN-Group: head
X-SVN-Commit-Author: phil
X-SVN-Commit-Paths: head/lib/libxo/tests
X-SVN-Commit-Revision: 320521
X-SVN-Commit-Repository: base
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: Fri, 30 Jun 2017 23:53:41 -0000

Author: phil
Date: Fri Jun 30 23:53:40 2017
New Revision: 320521
URL: https://svnweb.freebsd.org/changeset/base/320521

Log:
  Fix functional_test.sh to use --libxo options instead of the deprecated
  LIBXO_OPTIONS environment variable.
  
  Submitted by:	phil

Modified:
  head/lib/libxo/tests/functional_test.sh

Modified: head/lib/libxo/tests/functional_test.sh
==============================================================================
--- head/lib/libxo/tests/functional_test.sh	Fri Jun 30 22:19:18 2017	(r320520)
+++ head/lib/libxo/tests/functional_test.sh	Fri Jun 30 23:53:40 2017	(r320521)
@@ -39,14 +39,14 @@ check()
 	[ -s "${out_file}" ] && out_flag="-o file:${out_file}"
 
 	if [ "$xo_fmt" = "E" ]; then
-		LIBXO_OPTIONS="warn,encoder=test"
+		libxo_options=" warn,encoder=test"
 	else
-		LIBXO_OPTIONS=":W${xo_fmt}"
+		libxo_options=":W${xo_fmt}"
 	fi
 
 	atf_check -s exit:0 -e file:${err_file} -o file:${out_file} \
 	    env LC_ALL=en_US.UTF-8 \
-	        LIBXO_OPTIONS="${LIBXO_OPTIONS}" TZ="EST" "${SRCDIR}/${tc}" \
+	        TZ="EST" "${SRCDIR}/${tc}" --libxo${libxo_options}\
 
 }