diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-09-18 20:27:00 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-09-19 02:42:15 +0200 |
| commit | d1ac6ffc1399df928d768068231576b2ac3f5abe (patch) | |
| tree | 1509731cfcbe496a96296493dfdc766ee0f3c06f | |
| parent | 2379eb1fa629eebd9de8c1a542734243ff2ef471 (diff) | |
| download | pacman-d1ac6ffc1399df928d768068231576b2ac3f5abe.tar.gz pacman-d1ac6ffc1399df928d768068231576b2ac3f5abe.tar.xz | |
Fix make distcheck
* set util binary paths relative to top_builddir
* set pactest.py path relative to top_srcdir
* include tap.py in check_SCRIPTS
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | test/pacman/Makefile.am | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 77bc06da..f81fd79e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,13 +31,13 @@ include $(top_srcdir)/test/pacman/tests/TESTS TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ - PMTEST_UTIL_DIR=$(top_srcdir)/src/util/; export PMTEST_UTIL_DIR; \ + PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; TEST_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh -PY_LOG_COMPILER = test/pacman/pactest.py +PY_LOG_COMPILER = $(top_srcdir)/test/pacman/pactest.py AM_PY_LOG_FLAGS = \ --scriptlet-shell $(SCRIPTLET_SHELL) \ --ldconfig $(LDCONFIG) \ diff --git a/test/pacman/Makefile.am b/test/pacman/Makefile.am index d198ba25..55e3c7a8 100644 --- a/test/pacman/Makefile.am +++ b/test/pacman/Makefile.am @@ -8,6 +8,7 @@ check_SCRIPTS = \ pmpkg.py \ pmrule.py \ pmtest.py \ + tap.py \ util.py noinst_SCRIPTS = $(check_SCRIPTS) |