aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-08-03 22:18:48 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-08-03 22:18:48 +0800
commit97cdf848996b9a3aa8b7683b04798452ed8a5cb4 (patch)
tree2932236443b03337d6f5c15e1c8bc375a092335c /cmd
parent98db08c42f30e584dc1ef521b0c73c26d81b9f40 (diff)
parentd103af5dd479a7d2ce914e3b43d21506597032b4 (diff)
downloadgo-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar.gz
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar.bz2
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar.lz
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar.xz
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.tar.zst
go-tangerine-97cdf848996b9a3aa8b7683b04798452ed8a5cb4.zip
Merge pull request #1479 from tgerring/ethtest
Update ethtest default path for BlockTests
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethtest/main.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index 1ae77f88f..5429cab31 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -36,6 +36,7 @@ var (
defaultTest = "all"
defaultDir = "."
allTests = []string{"BlockTests", "StateTests", "TransactionTests", "VMTests", "RLPTests"}
+ testDirMapping = map[string]string{"BlockTests": "BlockchainTests"}
skipTests = []string{}
TestFlag = cli.StringFlag{
@@ -135,8 +136,13 @@ func runSuite(test, file string) {
var err error
var files []string
if test == defaultTest {
- files, err = getFiles(filepath.Join(file, curTest))
-
+ // check if we have an explicit directory mapping for the test
+ if _, ok := testDirMapping[curTest]; ok {
+ files, err = getFiles(filepath.Join(file, testDirMapping[curTest]))
+ } else {
+ // otherwise assume test name
+ files, err = getFiles(filepath.Join(file, curTest))
+ }
} else {
files, err = getFiles(file)
}