Skip to content

Commit f04ff74

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

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

Diff for: cli/cli_test.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030

3131
"github.com/spf13/viper"
3232

33+
"github.com/arduino/arduino-cli/cli/errorcodes"
3334
"github.com/arduino/arduino-cli/cli/feedback"
3435

3536
"bou.ke/monkey"
@@ -168,7 +169,9 @@ func executeWithArgs(args ...string) (int, []byte) {
168169
ArduinoCli.ResetFlags()
169170
createCliCommandTree(ArduinoCli)
170171
ArduinoCli.SetArgs(args)
171-
ArduinoCli.Execute()
172+
if err := ArduinoCli.Execute(); err != nil {
173+
exitCode = errorcodes.ErrGeneric
174+
}
172175
}()
173176

174177
return exitCode, output
@@ -309,7 +312,7 @@ func TestCompileCommandsIntegration(t *testing.T) {
309312
// Build sketch without FQBN
310313
exitCode, d = executeWithArgs("compile", test1)
311314
require.NotZero(t, exitCode)
312-
require.Contains(t, string(d), "no FQBN provided")
315+
require.Contains(t, string(d), "required flag(s) \"fqbn\" not set")
313316

314317
// Build sketch for arduino:avr:uno
315318
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)