Return 1 on fail

This commit is contained in:
obscuren 2015-03-12 18:22:56 +01:00
parent 83cc08f670
commit fb71c9f6ee

View File

@ -136,6 +136,7 @@ func RunVmTest(r io.Reader) (failed int) {
rexp := helper.FromHex(test.Out) rexp := helper.FromHex(test.Out)
if bytes.Compare(rexp, ret) != 0 { if bytes.Compare(rexp, ret) != 0 {
fmt.Printf("%s's return failed. Expected %x, got %x\n", name, rexp, ret) fmt.Printf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
failed = 1
} }
for addr, account := range test.Post { for addr, account := range test.Post {
@ -147,6 +148,7 @@ func RunVmTest(r io.Reader) (failed int) {
if len(test.Exec) == 0 { if len(test.Exec) == 0 {
if obj.Balance().Cmp(ethutil.Big(account.Balance)) != 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("%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
} }
} }
@ -156,17 +158,20 @@ func RunVmTest(r io.Reader) (failed int) {
if bytes.Compare(v, vexp) != 0 { 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("%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()) { 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("%s's : Post state root error. Expected %s, got %x", name, test.PostStateRoot, statedb.Root())
failed = 1
} }
if len(test.Logs) > 0 { if len(test.Logs) > 0 {
if len(test.Logs) != len(logs) { if len(test.Logs) != len(logs) {
fmt.Printf("log length mismatch. Expected %d, got %d", len(test.Logs), len(logs)) fmt.Printf("log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
failed = 1
} else { } else {
/* /*
fmt.Println("A", test.Logs) fmt.Println("A", test.Logs)