summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorphil <phil@FreeBSD.org>2017-08-07 17:23:44 +0000
committerphil <phil@FreeBSD.org>2017-08-07 17:23:44 +0000
commit24dec0b179f6eba6d055b33faf478d202bfb11ba (patch)
tree85d6194bf51077fe9f92a2d137b166076c2030f3 /usr.bin
parentf7b18a778494a28eccbb80840c7966374bb9e821 (diff)
downloadFreeBSD-src-24dec0b179f6eba6d055b33faf478d202bfb11ba.zip
FreeBSD-src-24dec0b179f6eba6d055b33faf478d202bfb11ba.tar.gz
Import libxo-0.8.4 from HEAD into stable/11
Submitted by: phil
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/xo/Makefile1
-rwxr-xr-xusr.bin/xo/tests/functional_test.sh4
2 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile
index 6159169..476ccae 100644
--- a/usr.bin/xo/Makefile
+++ b/usr.bin/xo/Makefile
@@ -4,6 +4,7 @@
LIBXOSRC= ${SRCTOP}/contrib/libxo
+.PATH:
.PATH: ${LIBXOSRC}/xo
PROG= xo
diff --git a/usr.bin/xo/tests/functional_test.sh b/usr.bin/xo/tests/functional_test.sh
index 2a26faa..684398f 100755
--- a/usr.bin/xo/tests/functional_test.sh
+++ b/usr.bin/xo/tests/functional_test.sh
@@ -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()
OpenPOWER on IntegriCloud