svn commit: r320521 - head/lib/libxo/tests

[Phil Shafer]

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}\
 
 }