From 16460b0048b738b0474bc1556d0df469f64bcf26 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 30 Dec 2014 17:16:28 +0100
Subject: Fixed gas check for vm test
---
tests/vm/gh_test.go | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
(limited to 'tests')
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 1efda7fe0..e06b0ed82 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -107,7 +107,9 @@ func RunVmTest(p string, t *testing.T) {
logs state.Logs
)
- if len(test.Exec) > 0 {
+ isVmTest := len(test.Exec) > 0
+
+ if isVmTest {
ret, logs, gas, err = helper.RunVm(statedb, env, test.Exec)
} else {
ret, logs, gas, err = helper.RunState(statedb, env, test.Transaction)
@@ -124,10 +126,14 @@ func RunVmTest(p string, t *testing.T) {
t.Errorf("%s's return failed. Expected %x, got %x\n", name, rexp, ret)
}
- if len(test.Gas) > 0 {
- gexp := ethutil.Big(test.Gas)
- if gexp.Cmp(gas) != 0 {
- t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
+ if isVmTest {
+ if len(test.Gas) == 0 && err == nil {
+ t.Errorf("%s's gas unspecified, indicating an error. VM returned (incorrectly) successfull")
+ } else {
+ gexp := ethutil.Big(test.Gas)
+ if gexp.Cmp(gas) != 0 {
+ t.Errorf("%s's gas failed. Expected %v, got %v\n", name, gexp, gas)
+ }
}
}
--
cgit v1.2.3