diff options
| -rw-r--r-- | cmd/ethtest/main.go | 3 | ||||
| -rw-r--r-- | tests/block_test_util.go | 6 | ||||
| -rw-r--r-- | tests/init.go | 2 | ||||
| -rw-r--r-- | tests/state_test_util.go | 5 | ||||
| -rw-r--r-- | tests/transaction_test_util.go | 5 | ||||
| -rw-r--r-- | tests/vm_test_util.go | 6 |
6 files changed, 15 insertions, 12 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index d89271a0c..07554c89f 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -29,7 +29,8 @@ import ( ) func main() { - // helper.Logger.SetLogLevel(5) + glog.SetToStderr(true) + // vm.Debug = true if len(os.Args) < 2 { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 787056b89..21fd07db6 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -19,6 +19,7 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/rlp" ) @@ -99,15 +100,14 @@ func RunBlockTest(filepath string) error { for name, test := range bt { // if the test should be skipped, return if skipTest[name] { - fmt.Println("Skipping state test", name) + glog.Infoln("Skipping block test", name) return nil } // test the block if err := testBlock(test); err != nil { return err } - fmt.Println("Block test passed: ", name) - + glog.Infoln("Block test passed: ", name) } return nil } diff --git a/tests/init.go b/tests/init.go index aec06396b..164924ab8 100644 --- a/tests/init.go +++ b/tests/init.go @@ -17,7 +17,7 @@ var ( transactionTestDir = filepath.Join(baseDir, "TransactionTests") vmTestDir = filepath.Join(baseDir, "VMTests") - blockSkipTests = []string{} + blockSkipTests = []string{"SimpleTx3"} transSkipTests = []string{"TransactionWithHihghNonce256"} stateSkipTests = []string{"mload32bitBound_return", "mload32bitBound_return2"} vmSkipTests = []string{} diff --git a/tests/state_test_util.go b/tests/state_test_util.go index cd87ee75e..ad14168c7 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -12,6 +12,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/logger/glog" ) func RunStateTest(p string) error { @@ -25,7 +26,7 @@ func RunStateTest(p string) error { for name, test := range tests { if skipTest[name] { - fmt.Println("Skipping state test", name) + glog.Infoln("Skipping state test", name) return nil } db, _ := ethdb.NewMemDatabase() @@ -105,7 +106,7 @@ func RunStateTest(p string) error { } } - fmt.Println("State test passed: ", name) + glog.Infoln("State test passed: ", name) //fmt.Println(string(statedb.Dump())) } return nil diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 2864257b7..ef133a99d 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/rlp" ) @@ -44,14 +45,14 @@ func RunTransactionTests(file string) error { for name, test := range bt { // if the test should be skipped, return if skipTest[name] { - fmt.Println("Skipping state test", name) + glog.Infoln("Skipping transaction test", name) return nil } // test the block if err := runTest(test); err != nil { return err } - fmt.Println("Transaction test passed: ", name) + glog.Infoln("Transaction test passed: ", name) } return nil diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go index 28e0c3f40..4145d1ebf 100644 --- a/tests/vm_test_util.go +++ b/tests/vm_test_util.go @@ -10,6 +10,7 @@ import ( "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" + "github.com/ethereum/go-ethereum/logger/glog" ) func RunVmTest(p string) error { @@ -26,7 +27,7 @@ func RunVmTest(p string) error { for name, test := range tests { if skipTest[name] { - fmt.Println("Skipping state test", name) + glog.Infoln("Skipping VM test", name) return nil } db, _ := ethdb.NewMemDatabase() @@ -102,8 +103,7 @@ func RunVmTest(p string) error { } } - fmt.Println("VM test passed: ", name) - + glog.Infoln("VM test passed: ", name) //fmt.Println(string(statedb.Dump())) } return nil |