[gentoo-commits] proj/openrc:master commit in: test/

[gentoo-commits] proj/openrc:master commit in: test/

[William Hubbs]

commit:     21abe9821cfad8f106761ebaca0b627bac917a2f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Oct 17 23:13:47 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 23:13:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=21abe982

tests: fix the paths

When the test suite is being run, we need our local directories in PATH
and LD_LIBRARY_PATH before the system directories. This makes sure we
run our tests using the currently built tree.

---
 test/setup_env.sh |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/setup_env.sh b/test/setup_env.sh
index 9f3a3fd..f992d71 100755
--- a/test/setup_env.sh
+++ b/test/setup_env.sh
@@ -9,10 +9,6 @@ srcdir=${srcdir:-.}
 top_builddir=${top_builddir:-${top_srcdir}}
 builddir=${builddir:-${srcdir}}
 
-export LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
-export PATH=${top_builddir}/src/rc:${PATH}
-
-
 if [ ! -f ${top_srcdir}/sh/functions.sh ] ; then
 	echo "functions.sh not yet created !?" 1>&2
 	exit 1
@@ -21,6 +17,9 @@ elif ! . ${top_srcdir}/sh/functions.sh; then
 	exit 1
 fi
 
+export LD_LIBRARY_PATH=${top_builddir}/src/libeinfo:${top_builddir}/src/librc:${LD_LIBRARY_PATH}
+export PATH=${top_builddir}/src/rc:${PATH}
+
 cd ${top_srcdir}/src/rc
 ${MAKE:-make} links >/dev/null
 cd -

[gentoo-commits] proj/openrc:master commit in: test/

[William Hubbs]

commit:     85c1930acf15b0c9d3c5537fb2b0409c6a11c982
Author:     William Pitcock <nenolod <AT> dereferenced <DOT> org>
AuthorDate: Tue Jan 31 20:48:59 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 23:27:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=85c1930a

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.

 test/setup_env.sh | 8 ++++----
 1 file 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
-