split legacy and new test to save time

This commit is contained in:
jangko 2021-01-14 21:33:18 +07:00 committed by andri lim
parent ad284e3d25
commit 03bed02512
2 changed files with 16 additions and 12 deletions

View File

@ -763,15 +763,17 @@ proc blockchainJsonMain*(debugMode = false) =
legacyFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "BlockchainTests" legacyFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "BlockchainTests"
newFolder = "eth_tests" / "BlockChainTests" newFolder = "eth_tests" / "BlockChainTests"
if paramCount() == 0 or not debugMode: let config = test_config.getConfiguration()
if config.testSubject == "" or not debugMode:
# run all test fixtures # run all test fixtures
if config.legacy:
suite "block chain json tests": suite "block chain json tests":
jsonTest(legacyFolder, "BlockchainTests", testFixture, skipBCTests) jsonTest(legacyFolder, "BlockchainTests", testFixture, skipBCTests)
else:
suite "new block chain json tests": suite "new block chain json tests":
jsonTest(newFolder, "newBlockchainTests", testFixture, skipNewBCTests) jsonTest(newFolder, "newBlockchainTests", testFixture, skipNewBCTests)
else: else:
# execute single test in debug mode # execute single test in debug mode
let config = test_config.getConfiguration()
if config.testSubject.len == 0: if config.testSubject.len == 0:
echo "missing test subject" echo "missing test subject"
quit(QuitFailure) quit(QuitFailure)

View File

@ -197,15 +197,17 @@ proc generalStateJsonMain*(debugMode = false) =
legacyFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "GeneralStateTests" legacyFolder = "eth_tests" / "LegacyTests" / "Constantinople" / "GeneralStateTests"
newFolder = "eth_tests" / "GeneralStateTests" newFolder = "eth_tests" / "GeneralStateTests"
if paramCount() == 0 or not debugMode: let config = getConfiguration()
if config.testSubject == "" or not debugMode:
# run all test fixtures # run all test fixtures
if config.legacy:
suite "generalstate json tests": suite "generalstate json tests":
jsonTest(legacyFolder , "GeneralStateTests", testFixture, skipGSTTests) jsonTest(legacyFolder , "GeneralStateTests", testFixture, skipGSTTests)
else:
suite "new generalstate json tests": suite "new generalstate json tests":
jsonTest(newFolder, "newGeneralStateTests", testFixture, skipNewGSTTests) jsonTest(newFolder, "newGeneralStateTests", testFixture, skipNewGSTTests)
else: else:
# execute single test in debug mode # execute single test in debug mode
let config = getConfiguration()
if config.testSubject.len == 0: if config.testSubject.len == 0:
echo "missing test subject" echo "missing test subject"
quit(QuitFailure) quit(QuitFailure)