Commit 217e8375 authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Make test block compilation and linking configurable.

parent c08e7427
...@@ -123,7 +123,7 @@ TARGETS:= ...@@ -123,7 +123,7 @@ TARGETS:=
include $(DIR)/$1/build.mk include $(DIR)/$1/build.mk
targets_$$(DIR): $$(TARGETS) targets_$$(DIR): $$(TARGETS)
$$(TARGETS): $(DIR)/$1/build.mk $$(TARGETS): $(DIR)/$1/build.mk Makefile build.mk buildflags.mk
TARGETS:= $$($(DIR)_TMPTARGETS) $$(TARGETS) TARGETS:= $$($(DIR)_TMPTARGETS) $$(TARGETS)
......
...@@ -8,3 +8,5 @@ BUILD_CONSOLE_J2000_INDI=@BUILD_CONSOLE_J2000_INDI@ ...@@ -8,3 +8,5 @@ BUILD_CONSOLE_J2000_INDI=@BUILD_CONSOLE_J2000_INDI@
BUILD_ETHERCAT=@BUILD_ETHERCAT@ BUILD_ETHERCAT=@BUILD_ETHERCAT@
BUILD_VESP=@BUILD_VESP@ BUILD_VESP=@BUILD_VESP@
BUILD_AM335X=@BUILD_AM335X@ BUILD_AM335X=@BUILD_AM335X@
BUILD_TEST=@BUILD_TEST@
...@@ -26,6 +26,12 @@ AC_ARG_ENABLE([am335x], ...@@ -26,6 +26,12 @@ AC_ARG_ENABLE([am335x],
[:], [:],
[enable_am335x=yes]) [enable_am335x=yes])
AC_ARG_ENABLE([test],
[AS_HELP_STRING([--disable-test], [Enable/Disable test blocks @<:@yes@:>@])],
[:],
[enable_test=yes])
####################################################################### #######################################################################
# #
# Enable/disable console # Enable/disable console
...@@ -113,6 +119,9 @@ AS_IF([test "$enable_am335x" = "yes" && test "$HAVE_ARM" = "1"], ...@@ -113,6 +119,9 @@ AS_IF([test "$enable_am335x" = "yes" && test "$HAVE_ARM" = "1"],
[AC_SUBST(BUILD_AM335X,["yes"])], [AC_SUBST(BUILD_AM335X,["yes"])],
[AC_SUBST(BUILD_AM335X,[""])]) [AC_SUBST(BUILD_AM335X,[""])])
AS_IF([test "$enable_test" = "yes"],
[AC_SUBST(BUILD_TEST,["yes"])],
[AC_SUBST(BUILD_TEST,[""])])
####################################################################### #######################################################################
# #
...@@ -154,3 +163,7 @@ AS_IF([test "$BUILD_VESP" != ""], ...@@ -154,3 +163,7 @@ AS_IF([test "$BUILD_VESP" != ""],
AS_IF([test "$BUILD_AM335X" != ""], AS_IF([test "$BUILD_AM335X" != ""],
AC_MSG_NOTICE([ am335x: yes]), AC_MSG_NOTICE([ am335x: yes]),
AC_MSG_NOTICE([ am335x: no])) AC_MSG_NOTICE([ am335x: no]))
AS_IF([test "$BUILD_TEST" != ""],
AC_MSG_NOTICE([ test: yes]),
AC_MSG_NOTICE([ test: no]))
...@@ -15,7 +15,9 @@ $(eval $(call SUBDIR,trigger)) ...@@ -15,7 +15,9 @@ $(eval $(call SUBDIR,trigger))
ifdef BUILD_ETHERCAT ifdef BUILD_ETHERCAT
$(eval $(call SUBDIR,ec)) $(eval $(call SUBDIR,ec))
endif endif
ifdef BUILD_TEST
$(eval $(call SUBDIR,test)) $(eval $(call SUBDIR,test))
endif
ifdef BUILD_VESP ifdef BUILD_VESP
$(eval $(call SUBDIR,vesp)) $(eval $(call SUBDIR,vesp))
endif endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment