aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-31 00:10:02 +0800
committerobscuren <geffobscura@gmail.com>2014-12-31 00:10:02 +0800
commita9068aa8ff1b3ee1a665f3759f4b3a94ac702884 (patch)
tree034cc7b5e49b8b5bb15e94d01425c0512a55aaba /cmd
parent51a97c031fdb609c869f64271e1c52966974a2ee (diff)
parent89244981a8a9f190a6afc74ec2c584692f04dcdd (diff)
downloadgo-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar.gz
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar.bz2
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar.lz
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar.xz
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.tar.zst
go-tangerine-a9068aa8ff1b3ee1a665f3759f4b3a94ac702884.zip
Merge branch 'develop' into poc8
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethtest/main.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index 94ab779db..96ef94e40 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -95,10 +95,15 @@ func RunVmTest(js string) (failed int) {
failed = 1
}
- gexp := ethutil.Big(test.Gas)
- if gexp.Cmp(gas) != 0 {
- log.Printf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
+ if len(test.Gas) == 0 && err == nil {
+ log.Printf("0 gas indicates error but no error given by VM")
failed = 1
+ } else {
+ gexp := ethutil.Big(test.Gas)
+ if gexp.Cmp(gas) != 0 {
+ log.Printf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
+ failed = 1
+ }
}
for addr, account := range test.Post {