Add TPM and PKCS #11 to coverage build

SoftHSMv1 included in 14.04 is too old and many tests fail,
so grabs prebuilt SoftHSMv2 binaries from www.randombit.net.
This can change to use the packaged SoftHSM in 16.04, whenever
Travis makes that available.

1 files changed, 11 insertions, 8 deletions

diff --git a/src/tests/main.cpp b/src/tests/main.cpp
index d80049d53..cf61ea0b0 100644
--- a/src/tests/main.cpp
+++ b/src/tests/main.cpp
@@ -93,16 +93,19 @@ class Test_Runner : public Botan_CLI::Command
 
             std::set<std::string> all_others = Botan_Tests::Test::registered_tests();
 
-            // do not run pkcs11 tests by default
-            for(std::set<std::string>::iterator iter = all_others.begin(); iter != all_others.end();)
+            if(pkcs11_lib.empty())
                {
-               if((*iter).find("pkcs11") != std::string::npos)
+               // do not run pkcs11 tests by default unless pkcs11-lib set
+               for(std::set<std::string>::iterator iter = all_others.begin(); iter != all_others.end();)
                   {
-                  iter = all_others.erase(iter);
-                  }
-               else
-                  {
-                  ++iter;
+                  if((*iter).find("pkcs11") != std::string::npos)
+                     {
+                     iter = all_others.erase(iter);
+                     }
+                  else
+                     {
+                     ++iter;
+                     }
                   }
                }