s/check/test/g

3 files changed, 35 insertions, 29 deletions

diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 26fb450a3..1b6a33773 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -1,7 +1,7 @@
 ### Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT      = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ LIB_LINK_CMD  = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS)
-CHECK_FLAGS   = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
+TEST_FLAGS    = $(TEST_OPT) $(LANG_FLAGS) $(WARN_FLAGS)
 
 ### Version Numbers
 VERSION       = %{version}
@@ -31,13 +31,13 @@ RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
 ### File Lists
-CHECK         = check
+TEST         = test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 LIBNAME       = botan
 
@@ -51,11 +51,13 @@ all: $(LIBRARIES)
 ### Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 ### Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) /Fe$@ $(CHECKOBJS) $(BOTAN_LIB) $(LINK_TO)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO)
 
 $(BOTAN_LIB): $(LIBOBJS)
 !If "$(SO_OBJ_FLAGS)" == ""
@@ -69,18 +71,18 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM) %{build_dir}\lib\* %{build_dir}\checks\*
+	$(RM) %{build_dir}\lib\* %{build_dir}\tests\*
 	$(RM) *.manifest *.exp *.dll
-	$(RM) $(LIBRARIES) $(CHECK)
+	$(RM) $(LIBRARIES) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
 	$(RMDIR) %{build_dir}\include\botan\internal
 	$(RMDIR) %{build_dir}\include\botan
 	$(RMDIR) %{build_dir}\include
-	$(RMDIR) %{build_dir}\lib %{build_dir}\checks
+	$(RMDIR) %{build_dir}\lib %{build_dir}\tests
 	$(RMDIR) %{build_dir}
-	$(RM) Makefile $(LIBNAME).* $(CHECK).*
+	$(RM) Makefile $(LIBNAME).* $(TEST).*
 
 ### Install Commands
 install: $(LIBRARIES)
diff --git a/src/build-data/makefile/unix.in b/src/build-data/makefile/unix.in
index fbc45a681..4eda9d5c9 100644
--- a/src/build-data/makefile/unix.in
+++ b/src/build-data/makefile/unix.in
@@ -1,13 +1,13 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT     = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
+TEST_FLAGS   = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -49,22 +49,24 @@ STATIC_LIB    = $(LIBNAME)-$(SERIES).a
 all: $(LIBRARIES)
 
 # File Lists
-CHECK         = %{check_prefix}check
+TEST         = %{test_prefix}test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 # Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) -o $(CHECK)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) $(TESTOBJS) $(STATIC_LIB) $(LINK_TO) -o $(TEST)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -80,8 +82,8 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM_R) %{build_dir}/lib/* %{build_dir}/checks/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(CHECK)
+	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
+	$(RM) $(LIBRARIES) $(SYMLINK) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
diff --git a/src/build-data/makefile/unix_shr.in b/src/build-data/makefile/unix_shr.in
index 610367dc5..ea37fb835 100644
--- a/src/build-data/makefile/unix_shr.in
+++ b/src/build-data/makefile/unix_shr.in
@@ -1,7 +1,7 @@
 # Compiler Options
 CXX           = %{cc}
 LIB_OPT       = %{lib_opt}
-CHECK_OPT     = %{check_opt}
+TEST_OPT      = %{test_opt}
 LANG_FLAGS    = %{lang_flags}
 WARN_FLAGS    = %{warn_flags}
 SO_OBJ_FLAGS  = %{shared_flags}
@@ -9,7 +9,7 @@ SO_LINK_CMD   = %{so_link}
 LINK_TO       = %{link_to}
 
 LIB_FLAGS     = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS)
-CHECK_FLAGS   = $(LANG_FLAGS) $(CHECK_OPT) $(WARN_FLAGS)
+TEST_FLAGS    = $(LANG_FLAGS) $(TEST_OPT) $(WARN_FLAGS)
 
 # Version Numbers
 VERSION       = %{version}
@@ -56,22 +56,24 @@ SYMLINK       = $(LIBNAME)-$(SERIES).%{so_suffix}
 all: $(LIBRARIES)
 
 # File Lists
-CHECK         = %{check_prefix}check
+TEST         = %{test_prefix}test
 
 HEADERS       = %{include_files}
 
 LIBOBJS       = %{lib_objs}
 
-CHECKOBJS     = %{check_objs}
+TESTOBJS     = %{test_objs}
 
 # Build Commands
 %{lib_build_cmds}
 
-%{check_build_cmds}
+%{test_build_cmds}
 
 # Link Commands
-$(CHECK): $(LIBRARIES) $(CHECKOBJS)
-	$(CXX) $(LDFLAGS) $(CHECKOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(CHECK)
+check: $(TEST)
+
+$(TEST): $(LIBRARIES) $(TESTOBJS)
+	$(CXX) $(LDFLAGS) $(TESTOBJS) $(SHARED_LIB) $(LINK_TO) -lboost_regex -o $(TEST)
 
 $(STATIC_LIB): $(LIBOBJS)
 	$(RM) $(STATIC_LIB)
@@ -94,8 +96,8 @@ docs:
 %{build_doc_commands}
 
 clean:
-	$(RM_R) %{build_dir}/lib/* %{build_dir}/checks/*
-	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(CHECK)
+	$(RM_R) %{build_dir}/lib/* %{build_dir}/tests/*
+	$(RM) $(LIBRARIES) $(SYMLINK) $(SONAME) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}