Skip to content

Commit

Permalink
Get one step closer to get make distcheck working with kyua
Browse files Browse the repository at this point in the history
  • Loading branch information
bapt committed Aug 28, 2014
1 parent 1bc61a4 commit 7b8dada
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 5 deletions.
3 changes: 1 addition & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ pkgconfig_DATA= libpkg/pkg.pc
$(pkgconfig_DATA): config.status

DISTCLEANFILES= pkg_repos.h
EXTRA_DIST= docs
EXTRA_DIST= docs Kyuafile
dist-hook:
rm -rf `find $(distdir)/external -type d -name .deps`

check-local:
make -C $(top_srcdir)/tests/ check-local
kyua --config=none test \
--kyuafile='$(top_srcdir)/Kyuafile' \
--build-root='$(top_builddir)'
Expand Down
4 changes: 3 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ AS_IF([test "x$with_ldns" = "xyes"], [
])

AC_CHECK_HEADER([atf-c.h], [
TESTS="\$(test_program)"
TESTS="\$(tests_programs)"
])

AC_CHECK_HEADER([sys/capability.h], [
Expand Down Expand Up @@ -327,4 +327,6 @@ AC_CONFIG_COMMANDS([pkg_repos.h], [[
rm $NMODULES
]], [REPOS=$REPOS])

AC_CONFIG_COMMANDS([mkdir], [$MKDIR_P tests/frontend])

AC_OUTPUT
24 changes: 22 additions & 2 deletions tests/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ GENERIC_LDADD= $(top_builddir)/libpkg/libpkg_static.la \
-larchive \
-lutil \
-lm \
-L/usr/local/lib \
-latf-c
PUBLIC_INCS= -I$(top_srcdir)/libpkg -DTESTING
PUBLIC_INCS= -I$(top_srcdir)/libpkg -DTESTING \
-I/usr/local/include
PRIVATE_INCS= $(PUBLIC_INCS) \
-I$(top_srcdir)/external/sqlite \
-I$(top_srcdir)/external/uthash \
Expand All @@ -32,11 +34,29 @@ plist_SOURCES= lib/plist.c
plist_CFLAGS= $(PRIVATE_INCS)
plist_LDADD= $(GENERIC_LDADD)

EXTRA_DIST= frontend/png.ucl \
Kyuafile \
frontend/Kyuafile \
frontend/annotate.shin \
frontend/pkg.shin \
frontend/search.shin \
frontend/version.shin \
frontend/test_environment

TESTS =
tests_programs= pkg_printf pkg_validation plist
EXTRA_PROGRAMS= $(tests_programs)
check_PROGRAMS= @TESTS@
check_SCRIPTS= frontend/pkg.sh \
frontend/annotate.sh \
frontend/search.sh \
frontend/version.sh
CLEANFILES+= ${check_SCRIPTS}
SUFFIXES = .sh

check-local: $(tests_programs)
.shin.sh:
@echo " GEN " $@;
@install -m 755 $< $@

lib/pkg_printf.c:
@echo " CP " $@;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7b8dada

Please sign in to comment.