aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-16 04:47:06 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-16 04:47:06 +0000
commit198977059ccb442d910eddc35feb2dd92280626d (patch)
tree3dafe33f502051fe46c33f3523034b01672f3b18
parent97f71bcdd71593fbf642341672c1db9fb72731c1 (diff)
downloadpaludis-198977059ccb442d910eddc35feb2dd92280626d.tar.gz
paludis-198977059ccb442d910eddc35feb2dd92280626d.tar.xz
Fix outputwrapper path
-rw-r--r--paludis/Makefile.am.m416
-rw-r--r--paludis/util/pstream.cc2
-rw-r--r--paludis/util/system.cc2
3 files changed, 10 insertions, 10 deletions
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 676f589..688e15c 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -99,14 +99,6 @@ endif
TESTS = testlist
-TESTS_ENVIRONMENT = env \
- PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
- PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
- PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
- TEST_SCRIPT_DIR="$(srcdir)/" \
- bash $(top_srcdir)/test/run_test.sh
-
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
@@ -146,4 +138,12 @@ changequote(`<', `>')
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(top_srcdir)/paludis/repositories/gentoo/ebuild/" \
+ PALUDIS_HOOKER_DIR="$(top_srcdir)/paludis/" \
+ PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/gentoo/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
+ PALUDIS_SKIP_CONFIG="yes" \
+ PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ bash $(top_srcdir)/test/run_test.sh
diff --git a/paludis/util/pstream.cc b/paludis/util/pstream.cc
index 23c2f58..11984d4 100644
--- a/paludis/util/pstream.cc
+++ b/paludis/util/pstream.cc
@@ -127,7 +127,7 @@ PStreamInBuf::PStreamInBuf(const Command & cmd) :
std::string c(cmd.command());
if ((! cmd.stdout_prefix().empty()) || (! cmd.stderr_prefix().empty()))
- c = LIBEXECDIR "/paludis/utils/outputwrapper --stdout-prefix '"
+ c = getenv_with_default("PALUDIS_OUTPUTWRAPPER_DIR", LIBEXECDIR "/paludis/utils") + "/outputwrapper --stdout-prefix '"
+ cmd.stdout_prefix() + "' --stderr-prefix '" + cmd.stderr_prefix() + "' -- " + c;
cmd.echo_to_stderr();
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index ead268f..6336c81 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -322,7 +322,7 @@ paludis::run_command(const Command & cmd)
std::string command(cmd.command());
if ((! cmd.stdout_prefix().empty()) || (! cmd.stderr_prefix().empty()))
- command = LIBEXECDIR "/paludis/utils/outputwrapper --stdout-prefix '"
+ command = getenv_with_default("PALUDIS_OUTPUTWRAPPER_DIR", LIBEXECDIR "/paludis/utils") + "/outputwrapper --stdout-prefix '"
+ cmd.stdout_prefix() + "' --stderr-prefix '" + cmd.stderr_prefix() + "' -- "
+ command;