Merge pull request #122 from ethereum/develop

version 0.1.1 development

Author: winsvega

retesteth/TestOutputHelper.cpp

@@ -304,6 +304,8 @@ bool pathHasTests(boost::filesystem::path const& _path)
 
 void checkUnfinishedTestFolders()
 {
+    if (Options::get().singleTestFile.is_initialized())
+        return;
     std::lock_guard<std::mutex> lock(g_finishedTestFoldersMapMutex);
     // Unit tests does not mark test folders
     if (finishedTestFoldersMap.size() == 0)

retesteth/main.cpp

@@ -33,27 +33,27 @@ void customTestSuite()
     if (opt.singleTestFile.is_initialized())
     {
         boost::filesystem::path file(opt.singleTestFile.get());
-        if (opt.rCurrentTestSuite.find_first_of("GeneralStateTests") != std::string::npos)
+        if (opt.rCurrentTestSuite.find("GeneralStateTests") != std::string::npos)
         {
             test::StateTestSuite suite;
             suite.runTestWithoutFiller(file);
         }
-        else if (opt.rCurrentTestSuite.find_first_of("BlockchainTests") != std::string::npos)
+        else if (opt.rCurrentTestSuite.find("BlockchainTests") != std::string::npos)
         {
             test::BlockchainTestValidSuite suite;
             suite.runTestWithoutFiller(file);
         }
-        else if (opt.rCurrentTestSuite.find_first_of("TransitionTests") != std::string::npos)
+        else if (opt.rCurrentTestSuite.find("TransitionTests") != std::string::npos)
         {
             // dev::test::TransitionTestsSuite suite;
             // suite.runTestWithoutFiller(file);
         }
-        else if (opt.rCurrentTestSuite.find_first_of("VMtests") != std::string::npos)
+        else if (opt.rCurrentTestSuite.find("VMtests") != std::string::npos)
         {
             // dev::test::VmTestSuite suite;
             // suite.runTestWithoutFiller(file);
         }
-        else if (opt.rCurrentTestSuite.find_first_of("TransactionTests") != std::string::npos)
+        else if (opt.rCurrentTestSuite.find("TransactionTests") != std::string::npos)
         {
             // dev::test::TransactionTestSuite suite;
             // suite.runTestWithoutFiller(file);