From 802d021d2e403862f4692ee67956e7e0160c1879 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Mon, 19 Nov 2012 19:09:37 -0500 Subject: [PATCH] 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 --- test/Makefile.am | 4 ++-- test/rules-test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 78440d23f..ab3b68e4a 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 1e224ff8b..d560f9a21 100755 --- a/test/rules-test.sh +++ b/test/rules-test.sh @@ -4,7 +4,7 @@ # (C) 2010 Canonical Ltd. # Author: Martin Pitt -[ -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'`