Merge pull request #626 from ethereum/faster-test

Faster test running by default

Author: msooseth

test/EVM/Test/Utils.hs

@@ -36,7 +36,7 @@ runSolidityTestCustom testFile match timeout maxIter ffiAllowed rpcinfo projectT
         internalError $ "Error compiling test file " <> show testFile <> " in directory "
           <> show root <> " using project type " <> show projectType
       Right bo@(BuildOutput contracts _) -> do
-        withSolvers Z3 1 1 timeout $ \solvers -> do
+        withSolvers Z3 3 1 timeout $ \solvers -> do
           opts <- liftIO $ testOpts solvers root (Just bo) match maxIter ffiAllowed rpcinfo
           unitTest opts contracts
 

test/test.hs

@@ -106,10 +106,10 @@ prop :: Testable prop => ReaderT Env IO prop -> Property
 prop a = ioProperty $ runEnv testEnv a
 
 withDefaultSolver :: App m => (SolverGroup -> m a) -> m a
-withDefaultSolver = withSolvers Z3 1 1 Nothing
+withDefaultSolver = withSolvers Z3 3 1 Nothing
 
 withCVC5Solver :: App m => (SolverGroup -> m a) -> m a
-withCVC5Solver = withSolvers CVC5 1 1 Nothing
+withCVC5Solver = withSolvers CVC5 3 1 Nothing
 
 main :: IO ()
 main = defaultMain tests