aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2017-01-31 20:48:59 +0000
committerWilliam Hubbs <w.d.hubbs@gmail.com>2017-01-31 17:27:13 -0600
commit85c1930acf15b0c9d3c5537fb2b0409c6a11c982 (patch)
treecc9b9ef33a5892f8445d326bbf1ba6011e113991
parentFix typo in guide.md (diff)
downloadopenrc-85c1930acf15b0c9d3c5537fb2b0409c6a11c982.zip
openrc-85c1930acf15b0c9d3c5537fb2b0409c6a11c982.tar.gz
openrc-85c1930acf15b0c9d3c5537fb2b0409c6a11c982.tar.bz2
test/setup_env: ensure that eval_ecolors is available on the path.
The test environment previously used the system default paths instead of installing the necessary $PATH environment variable to make finding eval_ecolors work. This closes #117. X-Gentoo-Bug: 374191. X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374191.
-rwxr-xr-xtest/setup_env.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/setup_env.sh b/test/setup_env.sh
index ffbd027..881984f 100755
--- a/test/setup_env.sh
+++ b/test/setup_env.sh
@@ -9,6 +9,10 @@ srcdir=${srcdir:-.}
top_builddir=${top_builddir:-${top_srcdir}}
builddir=${builddir:-${srcdir}}
+LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
+PATH=${top_builddir}/src/rc:${PATH}
+export LD_LIBRARY_PATH PATH
+
if [ ! -f ${top_srcdir}/sh/functions.sh ] ; then
echo "functions.sh not yet created !?" 1>&2
exit 1
@@ -17,7 +21,3 @@ elif ! . ${top_srcdir}/sh/functions.sh; then
exit 1
fi
-LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
-PATH=${top_builddir}/src/rc:${PATH}
-export LD_LIBRARY_PATH PATH
-