diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2012-11-19 19:09:37 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2012-11-19 19:09:48 -0500 |
| commit | 802d021d2e403862f4692ee67956e7e0160c1879 (patch) | |
| tree | 8bcc73a40238e848fc36539e848e3e254316f6b5 | |
| parent | a21f6c078b3f8ffe6c54247952030502166e8c12 (diff) | |
test/Makefile.am: fix tests for make distcheck
At several points in the forked code, top_srcdir and top_builddir
are mixed up. It is not clear if this is an upstream bug or if this
is a result of the initial restructuring of the build system. This
commit addresses this issue for tests triggered during make distcheck.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | test/Makefile.am | 4 | ||||
| -rwxr-xr-x | test/rules-test.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 78440d23f4..ab3b68e4a6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -9,10 +9,10 @@ check_DATA = \ test/sys: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz + $(AM_V_GEN)tar -C $(top_builddir)/test/ -xJf $(top_srcdir)/test/sys.tar.xz test-sys-distclean: - -rm -rf test/sys + -rm -rf $(top_builddir)/test/sys DISTCLEAN_LOCAL_HOOKS = \ test-sys-distclean diff --git a/test/rules-test.sh b/test/rules-test.sh index 1e224ff8b5..d560f9a217 100755 --- a/test/rules-test.sh +++ b/test/rules-test.sh @@ -4,7 +4,7 @@ # (C) 2010 Canonical Ltd. # Author: Martin Pitt <martin.pitt@ubuntu.com> -[ -n "$srcdir" ] || srcdir=`dirname $0`/.. +[ -n "$builddir" ] || builddir=`dirname $0`/.. # skip if we don't have python type python >/dev/null 2>&1 || { @@ -12,4 +12,4 @@ type python >/dev/null 2>&1 || { exit 0 } -$srcdir/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'` +$builddir/test/rule-syntax-check.py `find $builddir/rules -name '*.rules'` |