easier to read with all flags first
Cq-Include-Trybots: luci.skia.skia.primary:FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All,FM-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All
Change-Id: I319f2b80aec95f51ff9fe3db341bb7bf0d82d971
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/364015
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/infra/bots/task_drivers/fm_driver/fm_driver.go b/infra/bots/task_drivers/fm_driver/fm_driver.go
index 5faf541..dca66d4 100644
--- a/infra/bots/task_drivers/fm_driver/fm_driver.go
+++ b/infra/bots/task_drivers/fm_driver/fm_driver.go
@@ -123,9 +123,10 @@
stdout := &bytes.Buffer{}
stderr := &bytes.Buffer{}
cmd := &exec.Command{Name: fm, Stdout: stdout, Stderr: stderr, Verbose: verbosity}
- cmd.Args = append(cmd.Args, "-i", *resources, "-s")
- cmd.Args = append(cmd.Args, sources...)
+ cmd.Args = append(cmd.Args, "-i", *resources)
cmd.Args = append(cmd.Args, flags...)
+ cmd.Args = append(cmd.Args, "-s")
+ cmd.Args = append(cmd.Args, sources...)
// Run our FM command.
err := exec.Run(ctx, cmd)
@@ -295,7 +296,7 @@
commonFlags = append(commonFlags, "-b", "cpu")
run(tests, "")
- run(gms, "--ct 8888 --legacy") // Equivalent to DM --config 8888.
+ run(gms, "--ct 8888 --legacy") // Equivalent to DM --config 8888.
if model == "GCE" {
run(gms, "--ct g8 --legacy") // --config g8
