diff options
Diffstat (limited to 'cmd/ethtest/main.go')
| -rw-r--r-- | cmd/ethtest/main.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index e929d1de8..bbcde4c56 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -38,6 +38,7 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/tests/helper" + "github.com/ethereum/go-ethereum/vm" ) type Log struct { @@ -135,7 +136,8 @@ func RunVmTest(r io.Reader) (failed int) { rexp := helper.FromHex(test.Out) if bytes.Compare(rexp, ret) != 0 { - fmt.Printf("%s's return failed. Expected %x, got %x\n", name, rexp, ret) + fmt.Printf("FAIL: %s's return failed. Expected %x, got %x\n", name, rexp, ret) + failed = 1 } for addr, account := range test.Post { @@ -146,7 +148,8 @@ func RunVmTest(r io.Reader) (failed int) { if len(test.Exec) == 0 { if obj.Balance().Cmp(ethutil.Big(account.Balance)) != 0 { - fmt.Printf("%s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(ethutil.Big(account.Balance), obj.Balance())) + fmt.Printf("FAIL: %s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(ethutil.Big(account.Balance), obj.Balance())) + failed = 1 } } @@ -155,18 +158,21 @@ func RunVmTest(r io.Reader) (failed int) { vexp := helper.FromHex(value) if bytes.Compare(v, vexp) != 0 { - fmt.Printf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, ethutil.BigD(vexp), ethutil.BigD(v)) + fmt.Printf("FAIL: %s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, ethutil.BigD(vexp), ethutil.BigD(v)) + failed = 1 } } } if !bytes.Equal(ethutil.Hex2Bytes(test.PostStateRoot), statedb.Root()) { - fmt.Printf("%s's : Post state root error. Expected %s, got %x", name, test.PostStateRoot, statedb.Root()) + fmt.Printf("FAIL: %s's : Post state root error. Expected %s, got %x\n", name, test.PostStateRoot, statedb.Root()) + failed = 1 } if len(test.Logs) > 0 { if len(test.Logs) != len(logs) { - fmt.Printf("log length mismatch. Expected %d, got %d", len(test.Logs), len(logs)) + fmt.Printf("FAIL: log length mismatch. Expected %d, got %d", len(test.Logs), len(logs)) + failed = 1 } else { /* fmt.Println("A", test.Logs) @@ -189,6 +195,7 @@ func RunVmTest(r io.Reader) (failed int) { func main() { helper.Logger.SetLogLevel(5) + vm.Debug = true if len(os.Args) > 1 { os.Exit(RunVmTest(strings.NewReader(os.Args[1]))) |