Fix regression on compile and upload with attached sketches (arduino#545)

Massimiliano Pippi · web-flow · commit e2bc059e36b7 · 2020-01-08T14:33:35.000+01:00
* fix regression on board attach

* fix integration tests
diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -312,7 +312,7 @@ func TestCompileCommandsIntegration(t *testing.T) {
 	// Build sketch without FQBN
 	exitCode, d = executeWithArgs("compile", sketchPath)
 	require.NotZero(t, exitCode)
-	require.Contains(t, string(d), "required flag(s) \"fqbn\" not set")
+	require.Contains(t, string(d), "no FQBN provided")
 
 	// Build sketch for arduino:avr:uno
 	exitCode, d = executeWithArgs("compile", "-b", "arduino:avr:uno", sketchPath)
diff --git a/cli/compile/compile.go b/cli/compile/compile.go
@@ -78,8 +78,6 @@ func NewCommand() *cobra.Command {
 	command.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	command.Flags().StringVar(&vidPid, "vid-pid", "", "When specified, VID/PID specific build properties are used, if boards supports them.")
 
-	command.MarkFlagRequired("fqbn")
-
 	return command
 }
 
diff --git a/cli/upload/upload.go b/cli/upload/upload.go
@@ -54,7 +54,6 @@ func NewCommand() *cobra.Command {
 	uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
 	uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Optional, turns on verbose mode.")
 
-	uploadCommand.MarkFlagRequired("fqbn")
 	uploadCommand.MarkFlagRequired("port")
 
 	return uploadCommand

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ func NewCommand() *cobra.Command {`
`78`	`78`	`command.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")`
`79`	`79`	`command.Flags().StringVar(&vidPid, "vid-pid", "", "When specified, VID/PID specific build properties are used, if boards supports them.")`
`80`	`80`
`81`		`- command.MarkFlagRequired("fqbn")`
`82`		`-`
`83`	`81`	`return command`
`84`	`82`	`}`
`85`	`83`