diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-02 18:52:56 +0800 |
| commit | 64f35ba8d1f31d6821a0a1bf946c71396a996f30 (patch) | |
| tree | 375a081536c7c0b329a3b0c2e812ff05f81dd64c /tests/files/index.js | |
| parent | 616066a598933df7ef126186eb9c647094f665ca (diff) | |
| parent | 99481a245adc2c4814ab6b38d94d63114f7bbb15 (diff) | |
| download | dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.gz dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.bz2 dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.lz dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.xz dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.tar.zst dexon-64f35ba8d1f31d6821a0a1bf946c71396a996f30.zip | |
merge errors fixed
Diffstat (limited to 'tests/files/index.js')
| -rw-r--r-- | tests/files/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/files/index.js b/tests/files/index.js index a19fc2978..730107a27 100644 --- a/tests/files/index.js +++ b/tests/files/index.js @@ -9,6 +9,8 @@ module.exports = { txtest: require('./BasicTests/txtest'), StateTests: { stPreCompiledContracts: require('./StateTests/stPreCompiledContracts'), + stRecursiveCreate: require('./StateTests/stRecursiveCreate'), + stSpecial: require('./StateTests/stSpecialTest'), stSystemOperationsTest: require('./StateTests/stSystemOperationsTest'), }, VMTests: { @@ -17,8 +19,9 @@ module.exports = { vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'), vmEnvironmentalInfoTest: require('./VMTests/vmEnvironmentalInfoTest'), vmIOandFlowOperationsTest: require('./VMTests/vmIOandFlowOperationsTest'), + vmLogTest: require('./VMTests/vmLogTest'), vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'), vmSha3Test: require('./VMTests/vmSha3Test'), - vmtestst: require('./VMTests/vmtests'), + vmtests: require('./VMTests/vmtests'), } }; |