Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Christoph Jentzsch 2014-11-05 15:00:12 +01:00
commit 4669b5694b

View File

@ -1,23 +1,25 @@
module.exports = { module.exports = {
blockgenesis: require('./blockgenesistest'), blockgenesis: require('./BasicTests/blockgenesistest'),
genesishashes: require('./genesishashestest'), genesishashes: require('./BasicTests/genesishashestest'),
hexencode: require('./hexencodetest'), hexencode: require('./BasicTests/hexencodetest'),
keyaddrtests: require('./keyaddrtest'), keyaddrtests: require('./BasicTests/keyaddrtest'),
namecoin: require('./namecoin'), rlptest: require('./BasicTests/rlptest'),
rlptest: require('./rlptest'), trietest: require('./TrieTests/trietest'),
trietest: require('./trietest'), trietestnextprev: require('./TrieTests/trietestnextprev'),
trietestnextprev: require('./trietestnextprev'), txtest: require('./BasicTests/txtest'),
txtest: require('./txtest'), randomTests: {
vmtests: { 201410211705: require('./randomTests/201410211705'),
random: require('./vmtests/random'), 201410211708: require('./randomTests/201410211708')
vmArithmeticTest: require('./vmtests/vmArithmeticTest'), },
vmBitwiseLogicOperationTest: require('./vmtests/vmBitwiseLogicOperationTest'), VMTests: {
vmBlockInfoTest: require('./vmtests/vmBlockInfoTest'), vmArithmeticTest: require('./VMTests/vmArithmeticTest'),
vmEnvironmentalInfoTest: require('./vmtests/vmEnvironmentalInfoTest'), vmBitwiseLogicOperationTest: require('./VMTests/vmBitwiseLogicOperationTest'),
vmIOandFlowOperationsTest: require('./vmtests/vmIOandFlowOperationsTest'), vmBlockInfoTest: require('./VMTests/vmBlockInfoTest'),
vmPushDupSwapTest: require('./vmtests/vmPushDupSwapTest'), vmEnvironmentalInfoTest: require('./VMTests/vmEnvironmentalInfoTest'),
vmSha3Test: require('./vmtests/vmSha3Test'), vmIOandFlowOperationsTest: require('./VMTests/vmIOandFlowOperationsTest'),
vmSystemOperationsTest: require('./vmtests/vmSystemOperationsTest'), vmNamecoin: require('./VMTests/vmNamecoin'),
vmtests: require('./vmtests/vmtests') vmPushDupSwapTest: require('./VMTests/vmPushDupSwapTest'),
vmSha3Test: require('./VMTests/vmSha3Test'),
vmtestst: require('./VMTests/vmtests'),
} }
}; };