aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-01-17 04:07:24 -0500
committerMike Frysinger <vapier@gentoo.org>2011-01-17 04:07:24 -0500
commit1e73fd4b1ec3e09a880a7e00527952c647c19fc6 (patch)
treea8798455107bd3f32b8865495013328d644338fe
parentf796269a1d1bab63a6a9a6d60a27b03591e2fdef (diff)
tests: setup env before reading local files
The local files we source might use local binaries (like eval_ecolors), so setup the env first. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rwxr-xr-xtest/setup_env.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/setup_env.sh b/test/setup_env.sh
index 67949133..faa8c8b5 100755
--- a/test/setup_env.sh
+++ b/test/setup_env.sh
@@ -9,14 +9,14 @@ 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 ! . ${top_srcdir}/sh/functions.sh; then
echo "Sourcing functions.sh failed !?" 1>&2
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 -