From owner-svn-src-head@freebsd.org  Thu Jul  6 08:05:58 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 CF52EDA7818;
 Thu,  6 Jul 2017 08:05:58 +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 9DE8D1AA8;
 Thu,  6 Jul 2017 08:05:58 +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 v6685v6b080227;
 Thu, 6 Jul 2017 08:05:57 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6685vbK080225;
 Thu, 6 Jul 2017 08:05:57 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707060805.v6685vbK080225@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: Thu, 6 Jul 2017 08:05:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r320728 - head/usr.bin/xo/tests
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: head/usr.bin/xo/tests
X-SVN-Commit-Revision: 320728
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jul 2017 08:05:58 -0000

Author: ngie
Date: Thu Jul  6 08:05:57 2017
New Revision: 320728
URL: https://svnweb.freebsd.org/changeset/base/320728

Log:
  Chase upstream change deprecating LIBXO_OPTIONS similar to r320521
  
  LIBXO_OPTIONS was deprecated in favor of the --libxo options.
  
  Inspired by:	https://github.com/Juniper/libxo (02272d5c6d7d)

Modified:
  head/usr.bin/xo/tests/functional_test.sh

Modified: head/usr.bin/xo/tests/functional_test.sh
==============================================================================
--- head/usr.bin/xo/tests/functional_test.sh	Thu Jul  6 07:59:00 2017	(r320727)
+++ head/usr.bin/xo/tests/functional_test.sh	Thu Jul  6 08:05:57 2017	(r320728)
@@ -42,8 +42,8 @@ check()
 
 	atf_check -s exit:0 -e file:${err_file} -o file:${out_file} \
 	    env LC_ALL=en_US.UTF-8 \
-	        LIBXO_OPTIONS=":W${xo_fmt}" TZ="EST" "${SRCDIR}/${tc}" \
-		${XO}
+	        TZ="EST" "${SRCDIR}/${tc}" \
+		"${XO} --libxo:W${xo_fmt}"
 }
 
 add_testcase()