aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-03-11 19:56:49 +0100
committerDmitry Vyukov <dvyukov@google.com>2017-03-11 19:56:49 +0100
commit84dec9ec68e40c07d674619b54e0d0fedc6a3a79 (patch)
tree6d8fef71506bb7ac4ba073246442057e047a196c
parentc480878e4d571ef158250d74b51ed5924276e4c0 (diff)
config: fix odroid config parsing
There is a fallthrough in "gce" which now falls thrugh to "odroid" and fails there.
-rw-r--r--config/config.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/config/config.go b/config/config.go
index aae8de35b..a2f5606e6 100644
--- a/config/config.go
+++ b/config/config.go
@@ -140,11 +140,6 @@ func parse(data []byte) (*Config, map[int]bool, error) {
return nil, nil, fmt.Errorf("specify at least 1 adb device")
}
cfg.Count = len(cfg.Devices)
- case "gce":
- if cfg.Machine_Type == "" {
- return nil, nil, fmt.Errorf("machine_type parameter is empty (required for gce)")
- }
- fallthrough
case "odroid":
if cfg.Count != 1 {
return nil, nil, fmt.Errorf("no support for multiple Odroid devices yet, count should be 1")
@@ -167,6 +162,11 @@ func parse(data []byte) (*Config, map[int]bool, error) {
if cfg.Odroid_Hub_Port == 0 {
return nil, nil, fmt.Errorf("config param odroid_hub_port is empty")
}
+ case "gce":
+ if cfg.Machine_Type == "" {
+ return nil, nil, fmt.Errorf("machine_type parameter is empty (required for gce)")
+ }
+ fallthrough
default:
if cfg.Count <= 0 || cfg.Count > 1000 {
return nil, nil, fmt.Errorf("invalid config param count: %v, want (1, 1000]", cfg.Count)