Skip to content

Commit

Permalink
Use kyua's build-root feature
Browse files Browse the repository at this point in the history
Stop populating the build directory with copies of the Kyuafiles
required to run the tests and instead rely on kyua's --build-root
feature.  Much simpler to understand.
  • Loading branch information
jmmv committed Dec 7, 2013
1 parent 46ae9e3 commit 466dcd6
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 126 deletions.
2 changes: 1 addition & 1 deletion INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ To build and use Lutok successfully you need:
Optionally, if you want to build and run the tests (recommended), you
need:

* Kyua 0.2 or greater.
* Kyua 0.5 or greater.
* ATF 0.15 or greater.

If you are building Lutok from the code on the repository, you will also
Expand Down
13 changes: 2 additions & 11 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ doc_DATA = AUTHORS COPYING NEWS README
noinst_DATA = INSTALL README
EXTRA_DIST = $(doc_DATA) INSTALL README

include admin/Makefile.am.inc
include include/Makefile.am.inc

LUTOK_CFLAGS = -I$(srcdir)/include $(LUA_CFLAGS)
Expand Down Expand Up @@ -138,16 +137,8 @@ state_test_LDADD = $(LUTOK_LIBS) $(ATF_CXX_LIBS)
check-local: check-kyua
PHONY_TARGETS += check-kyua
check-kyua:
$(srcdir)/admin/populate-builddir.sh $(top_srcdir) $(top_builddir) \
cleanlist
$(TESTS_ENVIRONMENT) kyua test

CLEAN_TARGETS += clean-builddir
clean-builddir:
if test -f cleanlist; then \
rm -f $$(cat cleanlist); \
rm -f cleanlist; \
fi
$(TESTS_ENVIRONMENT) kyua test \
--kyuafile='$(top_srcdir)/Kyuafile' --build-root='$(top_builddir)'

installcheck-local: installcheck-kyua
PHONY_TARGETS += installcheck-kyua
Expand Down
29 changes: 0 additions & 29 deletions admin/Makefile.am.inc

This file was deleted.

85 changes: 0 additions & 85 deletions admin/populate-builddir.sh

This file was deleted.

0 comments on commit 466dcd6

Please # to comment.