Skip to content

Allow naming sketches like "RCS" and "CVS" #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 9, 2020
Merged

Allow naming sketches like "RCS" and "CVS" #537

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6de1e74
avoid paniking if main sketch file is missing
Jan 2, 2020
17456dd
rewrite the sketch contents collection logic + tests
Jan 2, 2020
26f2177
fix tests
Jan 2, 2020
0023f12
Merge branch 'master' into massi/522
Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
Massimiliano Pippi committed Jan 2, 2020
commit 26f21779a08c6d9cf4337b607e9a505a6fe617cc
4 changes: 2 additions & 2 deletions arduino/builder/sketch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func TestLoadSketchFolderBothInoAndPde(t *testing.T) {
sketchPath := filepath.Join("testdata", t.Name())
_, err := builder.SketchLoad(sketchPath, "")
require.Error(t, err)
require.Contains(t, err.Error(), "more than one main sketch file found")
require.Contains(t, err.Error(), "multiple main sketch files found")
require.Contains(t, err.Error(), t.Name()+".ino")
require.Contains(t, err.Error(), t.Name()+".pde")
}
Expand Down Expand Up @@ -157,7 +157,7 @@ func TestLoadSketchFolderWrongMain(t *testing.T) {
sketchPath := filepath.Join("testdata", t.Name())
_, err := builder.SketchLoad(sketchPath, "")
require.Error(t, err)
require.Contains(t, err.Error(), "unable to find an sketch file in directory testdata")
require.Contains(t, err.Error(), "unable to find a sketch file in directory testdata")

_, err = builder.SketchLoad("does/not/exist", "")
require.Error(t, err)
Expand Down