aboutsummaryrefslogtreecommitdiffstats
path: root/vm/adb
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2018-05-07 17:59:06 +0200
committerDmitry Vyukov <dvyukov@google.com>2018-05-07 17:59:06 +0200
commit9e0846e8a4beebff36c72f03479a7db775b5144e (patch)
tree5be248f1b661837ea2378648676e3f0f8d5746c6 /vm/adb
parent99c1f486598445575a3a624bf70dc6a31f60d365 (diff)
all: get rid of underscores in identifiers
Underscores are against Go coding style. Update #538
Diffstat (limited to 'vm/adb')
-rw-r--r--vm/adb/adb.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/vm/adb/adb.go b/vm/adb/adb.go
index e6908a9aa..1c1271b34 100644
--- a/vm/adb/adb.go
+++ b/vm/adb/adb.go
@@ -28,15 +28,15 @@ func init() {
}
type Config struct {
- Adb string // adb binary name ("adb" by default)
- Devices []string // list of adb device IDs to use
+ Adb string `json:"adb"` // adb binary name ("adb" by default)
+ Devices []string `json:"devices"` // list of adb device IDs to use
// Ensure that a device battery level is at 20+% before fuzzing.
// Sometimes we observe that a device can't charge during heavy fuzzing
// and eventually powers down (which then requires manual intervention).
// This option is enabled by default. Turn it off if your devices
// don't have battery service, or it causes problems otherwise.
- Battery_Check bool
+ BatteryCheck bool `json:"battery_check"`
}
type Pool struct {
@@ -54,8 +54,8 @@ type instance struct {
func ctor(env *vmimpl.Env) (vmimpl.Pool, error) {
cfg := &Config{
- Adb: "adb",
- Battery_Check: true,
+ Adb: "adb",
+ BatteryCheck: true,
}
if err := config.LoadData(env.Config, cfg); err != nil {
return nil, fmt.Errorf("failed to parse adb vm config: %v", err)
@@ -103,7 +103,7 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) {
return nil, err
}
inst.console = findConsole(inst.adbBin, inst.device)
- if pool.cfg.Battery_Check {
+ if pool.cfg.BatteryCheck {
if err := inst.checkBatteryLevel(); err != nil {
return nil, err
}