Skip to content

Commit d235a6b

Browse files
committed
Improve error message when port or fqbn flags are missing
1 parent d474176 commit d235a6b

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Diff for: cli/cli_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ func executeWithArgs(args ...string) (int, []byte) {
168168
ArduinoCli.ResetFlags()
169169
createCliCommandTree(ArduinoCli)
170170
ArduinoCli.SetArgs(args)
171-
ArduinoCli.Execute()
171+
if err := ArduinoCli.Execute(); err != nil {
172+
exitCode = errorcodes.ErrGeneric)
173+
}
172174
}()
173175

174176
return exitCode, output
@@ -309,7 +311,7 @@ func TestCompileCommandsIntegration(t *testing.T) {
309311
// Build sketch without FQBN
310312
exitCode, d = executeWithArgs("compile", test1)
311313
require.NotZero(t, exitCode)
312-
require.Contains(t, string(d), "no FQBN provided")
314+
require.Contains(t, string(d), "required flag(s) \"fqbn\" not set")
313315

314316
// Build sketch for arduino:avr:uno
315317
exitCode, d = executeWithArgs("compile", "-b", "arduino:avr:uno", test1)

Diff for: cli/compile/compile.go

+2
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ func NewCommand() *cobra.Command {
8080
command.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
8181
command.Flags().StringVar(&vidPid, "vid-pid", "", "When specified, VID/PID specific build properties are used, if boards supports them.")
8282

83+
command.MarkFlagRequired("fqbn")
84+
8385
return command
8486
}
8587

Diff for: cli/upload/upload.go

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ func NewCommand() *cobra.Command {
5656
uploadCommand.Flags().BoolVarP(&verify, "verify", "t", false, "Verify uploaded binary after the upload.")
5757
uploadCommand.Flags().BoolVarP(&verbose, "verbose", "v", false, "Optional, turns on verbose mode.")
5858

59+
uploadCommand.MarkFlagRequired("fqbn")
60+
uploadCommand.MarkFlagRequired("port")
61+
5962
return uploadCommand
6063
}
6164

0 commit comments

Comments
 (0)