diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2012-10-17 18:13:47 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2012-10-17 18:13:47 -0500 |
| commit | 21abe9821cfad8f106761ebaca0b627bac917a2f (patch) | |
| tree | ddd472adc2d1fc45ce643b13aaa13abbe3b0874f | |
| parent | f88637274991e4d427da6dae3ef0e181f0e1d9a1 (diff) | |
| download | openrc-21abe9821cfad8f106761ebaca0b627bac917a2f.tar.gz openrc-21abe9821cfad8f106761ebaca0b627bac917a2f.tar.bz2 openrc-21abe9821cfad8f106761ebaca0b627bac917a2f.tar.xz | |
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.
| -rwxr-xr-x | 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 - |