xLua - Lua C++ API

Check-in [dd98dc60f4]
Login
Overview
Comment:Allow "make check" to be run when kyua is missing Discovered while trying to setup Travis CI.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | master | trunk
Files: files | file ages | folders
SHA3-256:dd98dc60f495ee90ecb4cb2ceb178c9c4e867ee1d1efa641e0ee6245a3370c39
User & Date: jmmv@google.com 2014-08-02 02:23:59
Context
2014-08-02
02:24
Try to fully set up Kyua in Travis CI This is so that we can run the full test suite. Didn't want to do this yet, but yet, it's not that hard and we'll need this for running Kyua later on. check-in: 507defb80c user: jmmv@google.com tags: master, trunk
02:23
Allow "make check" to be run when kyua is missing Discovered while trying to setup Travis CI. check-in: dd98dc60f4 user: jmmv@google.com tags: master, trunk
02:23
Fix error handling on call to access(2) check-in: 9bdc2e0b87 user: jmmv@google.com tags: master, trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.am.

131
132
133
134
135
136
137

138
139
140
141
142
143
144
145
146
147

148
149
150
151
152
153
154
stack_cleaner_test_LDADD = $(LUTOK_LIBS) $(ATF_CXX_LIBS)

tests_PROGRAMS += state_test
state_test_SOURCES = state_test.cpp test_utils.hpp
state_test_CXXFLAGS = $(LUTOK_CFLAGS) $(ATF_CXX_CFLAGS)
state_test_LDADD = $(LUTOK_LIBS) $(ATF_CXX_LIBS)


check-local: check-kyua
PHONY_TARGETS += check-kyua
check-kyua:
	$(TESTS_ENVIRONMENT) kyua test \
	    --kyuafile='$(top_srcdir)/Kyuafile' --build-root='$(top_builddir)'

installcheck-local: installcheck-kyua
PHONY_TARGETS += installcheck-kyua
installcheck-kyua:
	cd $(testsdir) && $(TESTS_ENVIRONMENT) kyua test

else
DIST_HOOKS += dist-no-atf
PHONY_TARGETS += dist-no-atf
dist-no-atf:
	@echo "Sorry; cannot build a distfile without atf"
	@false
endif







>










>







131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
stack_cleaner_test_LDADD = $(LUTOK_LIBS) $(ATF_CXX_LIBS)

tests_PROGRAMS += state_test
state_test_SOURCES = state_test.cpp test_utils.hpp
state_test_CXXFLAGS = $(LUTOK_CFLAGS) $(ATF_CXX_CFLAGS)
state_test_LDADD = $(LUTOK_LIBS) $(ATF_CXX_LIBS)

if HAVE_KYUA
check-local: check-kyua
PHONY_TARGETS += check-kyua
check-kyua:
	$(TESTS_ENVIRONMENT) kyua test \
	    --kyuafile='$(top_srcdir)/Kyuafile' --build-root='$(top_builddir)'

installcheck-local: installcheck-kyua
PHONY_TARGETS += installcheck-kyua
installcheck-kyua:
	cd $(testsdir) && $(TESTS_ENVIRONMENT) kyua test
endif
else
DIST_HOOKS += dist-no-atf
PHONY_TARGETS += dist-no-atf
dist-no-atf:
	@echo "Sorry; cannot build a distfile without atf"
	@false
endif

Changes to configure.ac.

52
53
54
55
56
57
58




59
60
61
62
63
64
65
66


ATF_CHECK_CXX([>= 0.15])
ATF_CHECK_SH([>= 0.15])
ATF_ARG_WITH
KYUA_DOXYGEN
KYUA_LUA




AC_PATH_PROG([GIT], [git])


AC_SUBST(pkgconfigdir, \${libdir}/pkgconfig)
AC_SUBST(testsdir, \${exec_prefix}/tests/lutok)


AC_OUTPUT







>
>
>
>








52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70


ATF_CHECK_CXX([>= 0.15])
ATF_CHECK_SH([>= 0.15])
ATF_ARG_WITH
KYUA_DOXYGEN
KYUA_LUA


AC_PATH_PROG([KYUA], [kyua])
AM_CONDITIONAL([HAVE_KYUA], [test -n "${KYUA}"])
AC_PATH_PROG([GIT], [git])


AC_SUBST(pkgconfigdir, \${libdir}/pkgconfig)
AC_SUBST(testsdir, \${exec_prefix}/tests/lutok)


AC_OUTPUT