Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: test/
Date: Tue, 31 Jan 2017 23:37:06
Message-Id: 1485905233.85c1930acf15b0c9d3c5537fb2b0409c6a11c982.williamh@OpenRC
1 commit: 85c1930acf15b0c9d3c5537fb2b0409c6a11c982
2 Author: William Pitcock <nenolod <AT> dereferenced <DOT> org>
3 AuthorDate: Tue Jan 31 20:48:59 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 23:27:13 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=85c1930a
7
8 test/setup_env: ensure that eval_ecolors is available on the path.
9
10 The test environment previously used the system default paths instead of installing the necessary $PATH environment
11 variable to make finding eval_ecolors work.
12 This closes #117.
13
14 X-Gentoo-Bug: 374191.
15 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=374191.
16
17 test/setup_env.sh | 8 ++++----
18 1 file changed, 4 insertions(+), 4 deletions(-)
19
20 diff --git a/test/setup_env.sh b/test/setup_env.sh
21 index ffbd027..881984f 100755
22 --- a/test/setup_env.sh
23 +++ b/test/setup_env.sh
24 @@ -9,6 +9,10 @@ srcdir=${srcdir:-.}
25 top_builddir=${top_builddir:-${top_srcdir}}
26 builddir=${builddir:-${srcdir}}
27
28 +LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
29 +PATH=${top_builddir}/src/rc:${PATH}
30 +export LD_LIBRARY_PATH PATH
31 +
32 if [ ! -f ${top_srcdir}/sh/functions.sh ] ; then
33 echo "functions.sh not yet created !?" 1>&2
34 exit 1
35 @@ -17,7 +21,3 @@ elif ! . ${top_srcdir}/sh/functions.sh; then
36 exit 1
37 fi
38
39 -LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
40 -PATH=${top_builddir}/src/rc:${PATH}
41 -export LD_LIBRARY_PATH PATH
42 -