Merge pull request #3 from ethereum/develop

Update to develop

1 files changed, 4 insertions, 21 deletions

diff --git a/tests/files/index.js b/tests/files/index.js
index 84615a482..6db56cc55 100644
--- a/tests/files/index.js
+++ b/tests/files/index.js
@@ -1,23 +1,6 @@
 module.exports = {
-  blockgenesis: require('./blockgenesistest'),
-  genesishashes: require('./genesishashestest'),
-  hexencode: require('./hexencodetest'),
-  keyaddrtests: require('./keyaddrtest'),
-  namecoin: require('./namecoin'),
-  rlptest: require('./rlptest'),
-  trietest: require('./trietest'),
-  trietestnextprev: require('./trietestnextprev'),
-  txtest: require('./txtest'),
-  vmtests: {
-    random: require('./vmtests/random'),
-    vmArithmeticTest: require('./vmtests/vmArithmeticTest'),
-    vmBitwiseLogicOperationTest: require('./vmtests/vmBitwiseLogicOperationTest'),
-    vmBlockInfoTest: require('./vmtests/vmBlockInfoTest'),
-    vmEnvironmentalInfoTest: require('./vmtests/vmEnvironmentalInfoTest'),
-    vmIOandFlowOperationsTest: require('./vmtests/vmIOandFlowOperationsTest'),
-    vmPushDupSwapTest: require('./vmtests/vmPushDupSwapTest'),
-    vmSha3Test: require('./vmtests/vmSha3Test'),
-    vmSystemOperationsTest: require('./vmtests/vmSystemOperationsTest'),
-    vmtests: require('./vmtests/vmtests')
-  }
+  basicTests: require('require-all')(__dirname + '/BasicTests/'),
+  trieTests: require('require-all')(__dirname + '/TrieTests/'),
+  stateTests: require('require-all')(__dirname + '/StateTests/'),
+  vmTests: require('require-all')(__dirname + '/VMTests')
 };