From 6ad817e17b1243ada369b04eec3096403ea3499c Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Thu, 21 May 2015 23:04:46 +0200 Subject: [PATCH] Add StateTests/RandomTests and VMTests/RandomTests --- tests/vm/gh_test.go | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 68eb4cb45..2f76084d0 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -2,7 +2,6 @@ package vm import ( "bytes" - "io/ioutil" "math/big" "os" "path/filepath" @@ -373,21 +372,16 @@ func TestWallet(t *testing.T) { RunVmTest(fn, t) } -func TestRandom(t *testing.T) { - // TODO: fix JSON EOF bug and unskip - t.Skip() - fileNames := make([]string, 1024) - fileInfos, err := ioutil.ReadDir("../files/StateTests/RandomTests") - if err != nil { - t.Errorf("Could not read StateTests/RandomTests dir: %v", err) - return +func TestStateTestsRandom(t *testing.T) { + fns, _ := filepath.Glob("../files/StateTests/RandomTests/*") + for _, fn := range fns { + RunVmTest(fn, t) + } +} + +func TestVMRandom(t *testing.T) { + fns, _ := filepath.Glob("../files/VMTests/RandomTests/*") + for _, fn := range fns { + RunVmTest(fn, t) } - for _, fileInfo := range fileInfos { - fileNames = append(fileNames, fileInfo.Name()) - } - - //for _, f := range fileNames { - path := filepath.Join("../files/StateTests/RandomTests/", fileNames[0]) - RunVmTest(path, t) - //} }