X-Git-Url: https://git.dlugolecki.net.pl/?p=command.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=e17e256c212f08c9e279284b4ac9574b4511dbf2;hp=214d6f2d9b94f2661b009ddfb0e4894c2b83cd03;hb=ae6743a2a2c69b7a927f64ff1d3abf38a5e7d4bc;hpb=95af563cb577e8eedc95c0664a6529d12ea050ed

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 214d6f2..e17e256 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,38 +1,58 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
+TEST_PROGS = \
+	descriptive/holds_data.test \
+	callable/invokes_provided_function.test \
+	callable/invokes_void_function.test \
+	callable/invokes_class_method.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_arguments_by_separator.test \
-	multivalue_should_extract_options_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
 callable_invokes_void_function_test_SOURCES  = callable/invokes_void_function.cpp
+callable_invokes_class_method_test_SOURCES  = callable/invokes_class_method.cpp
 
 parameter_is_descriptive_test_SOURCES  = parameter/is_descriptive.cpp
 parameter_should_be_non_required_test_SOURCES = parameter/should_be_non_required.cpp
@@ -58,3 +78,5 @@ required_should_be_required_test_SOURCES = required/should_be_required.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