s/check/test/g

15 files changed, 46 insertions, 41 deletions

diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
index f2ea46ef2..9a810d7cd 100644
--- a/src/build-data/cc/bcc.txt
+++ b/src/build-data/cc/bcc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "-O2"
 debug_flags ""
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags ""
 warning_flags ""
 
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 6202d2263..16c7d37f8 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -15,7 +15,7 @@ warning_flags "-Wextra -Wall"
 makefile_style unix
 
 lib_opt_flags "-O3"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 no_debug_flags ""
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index c6e8b6550..a95093876 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
 
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 38bc44676..78f54bd56 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -13,7 +13,7 @@ maintainer_warning_flags "-Werror -Wno-error=old-style-cast -Wno-error=zero-as-n
 warning_flags "-Wall -Wextra -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual -Wold-style-cast -Wzero-as-null-pointer-constant"
 
 lib_opt_flags "-O3"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 shared_flags "-fPIC"
 debug_flags "-g -fno-inline-functions"
 
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 4b21a03de..b3cd58c2f 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "+O2"
-check_opt_flags "+O2"
+test_opt_flags "+O2"
 debug_flags -g
 no_debug_flags ""
 lang_flags "-AA -ext +eh -z"
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index e11875cb1..eac9fc218 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2 -ip -unroll"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 debug_flags -g
 no_debug_flags "-fomit-frame-pointer"
 lang_flags "-std=c++0x"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 034ea7444..4e75d5ba1 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -10,7 +10,7 @@ add_lib_option ""
 
 no_debug_flags "/O2"
 debug_flags "/Od /Zi /DDEBUG"
-check_opt_flags "/O2 /D_CONSOLE"
+test_opt_flags "/O2 /D_CONSOLE"
 lang_flags "/EHs /GR"
 warning_flags "/W3 /wd4275 /wd4267"
 
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index 52f35a7e8..543d84021 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
-check_opt_flags "-O3 -OPT:alias=TYPED"
+test_opt_flags "-O3 -OPT:alias=TYPED"
 debug_flags "-g3"
 no_debug_flags "-fomit-frame-pointer"
 shared_flags "-fPIC"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index 985c534b9..6a2f104ff 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-fast -Minline"
-check_opt_flags "-fast"
+test_opt_flags "-fast"
 shared_flags "-fPIC"
 
 makefile_style unix
diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt
index 43e5fcf8a..75cf1a758 100644
--- a/src/build-data/cc/sunstudio.txt
+++ b/src/build-data/cc/sunstudio.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-xO5"
-check_opt_flags "-xO2"
+test_opt_flags "-xO2"
 debug_flags -g
 no_debug_flags ""
 shared_flags "-KPIC"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 609439243..73ae91747 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -9,7 +9,7 @@ add_lib_dir_option -L
 add_lib_option -l
 
 lib_opt_flags "-O2"
-check_opt_flags "-O2"
+test_opt_flags "-O2"
 lang_flags ""
 debug_flags -g
 no_debug_flags ""
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}
diff --git a/src/cert/x509/x509path.cpp b/src/cert/x509/x509path.cpp
index 6aa7251e7..28b4a6d99 100644
--- a/src/cert/x509/x509path.cpp
+++ b/src/cert/x509/x509path.cpp
@@ -159,7 +159,6 @@ Certificate_Status_Code check_chain(const std::vector<X509_Certificate>& cert_pa
          {
          if(restrictions.require_revocation_information())
             return Certificate_Status_Code::NO_REVOCATION_DATA;
-         std::cout << "No revocation information for " << subject.subject_dn() << "\n";
          continue;
          }