X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=tests%2FMakefile.am;h=4df147ebef0950d67f77c59f3d228c9da83a8b89;hb=a62cd661611b4c90b5ebe70f6f466f04a7f98684;hp=d7b072a9b6a377bcc11e07a3af707c01f85b733c;hpb=32ec13f77dce87c6f8086baa954b1d0f9fedb89c;p=command.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d7b072a..4df147e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,33 +1,52 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+TEST_PROGS = \
+	descriptive/holds_data.test \
+	callable/invokes_provided_function.test \
+	callable/invokes_void_function.test \
+	parameter/is_descriptive.test \
+	parameter/should_be_non_required.test \
+	argument/handles_string_value.test \
+	argument/handles_int_value.test \
+	argument/handles_negative_int_value.test \
+	argument/handles_float_value.test \
+	argument/handles_negative_float_value.test \
+	argument/handles_boolean_value.test \
+	option/handles_string_value.test \
+	option/handles_int_value.test \
+	option/handles_negative_int_value.test \
+	option/handles_float_value.test \
+	option/handles_negative_float_value.test \
+	option/handles_boolean_value.test \
+	option/handles_void_value.test \
+	option/should_match_exact_name.test \
+	option/should_throw_exception_on_missing_value.test \
+	required/should_be_required.test \
+	multivalue/should_extract_arguments_by_separator.test \
+	multivalue/should_extract_options_by_separator.test
+
+TEST_SCRPTS = \
+	command/understand_void_option.test \
+	command/understand_bool_option.test \
+	command/understand_int_option.test \
+	command/understand_unsigned_int_option.test
+
 TESTS = \
-	descriptive_holds_data.test \
-	callable_invokes_provided_function.test \
-	callable_invokes_void_function.test \
-	parameter_is_descriptive.test \
-	parameter_should_be_non_required.test \
-	argument_handles_string_value.test \
-	argument_handles_int_value.test \
-	argument_handles_negative_int_value.test \
-	argument_handles_float_value.test \
-	argument_handles_negative_float_value.test \
-	argument_handles_boolean_value.test \
-	option_handles_string_value.test \
-	option_handles_int_value.test \
-	option_handles_negative_int_value.test \
-	option_handles_float_value.test \
-	option_handles_negative_float_value.test \
-	option_handles_boolean_value.test \
-	option_handles_void_value.test \
-	option_should_match_exact_name.test \
-	option_should_throw_exception_on_missing_value.test \
-	required_should_be_required.test \
-	multivalue_should_extract_values_by_separator.test
-
-noinst_PROGRAMS = $(TESTS)
+	$(TEST_PROGS) \
+	$(TEST_SCRPTS)
+
+EXTRA_DIST = \
+	$(TEST_SCRPTS)
+
+noinst_PROGRAMS = \
+	$(TEST_PROGS) \
+	command/option_test_command
 
 AM_CXXFLAGS = -I$(top_srcdir)/include -std=c++11
 
+check-% :	%.test all
+	@srcdir=$(srcdir); export srcdir;
+
 descriptive_holds_data_test_SOURCES  = descriptive/holds_data.cpp
 
 callable_invokes_provided_function_test_SOURCES  = callable/invokes_provided_function.cpp
@@ -55,4 +74,7 @@ option_should_throw_exception_on_missing_value_test_SOURCES = option/should_thro
 
 required_should_be_required_test_SOURCES = required/should_be_required.cpp
 
-multivalue_should_extract_values_by_separator_test_SOURCES = multiValue/should_extract_values_by_separator.cpp
+multivalue_should_extract_arguments_by_separator_test_SOURCES = multiValue/should_extract_arguments_by_separator.cpp
+multivalue_should_extract_options_by_separator_test_SOURCES = multiValue/should_extract_options_by_separator.cpp
+
+command_option_test_command_SOURCES = command/src/option_test_command.cpp