Skip to content

Commit c6a3a87

Browse files
authored
Merge pull request #31 from ifreecarve/2018-04-12_ci
Hotfix for CI script problems
2 parents f190454 + fedb5b8 commit c6a3a87

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased]
88
### Added
9+
- Explicit tests of `.arduino-ci.yml` in `TestSomething` example
910

1011
### Changed
1112

@@ -14,6 +15,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1415
### Removed
1516

1617
### Fixed
18+
- Malformed YAML (duplicate unittests section) now has no duplicate section
19+
- arduino_ci_remote.rb script now has correct arguments in build_for_test_with_configuration
1720

1821
### Security
1922

SampleProjects/TestSomething/.arduino-ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,5 @@ unittest:
22
platforms:
33
- uno
44
- due
5-
6-
unittest:
75
compilers:
86
- g++

SampleProjects/TestSomething/Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: /Users/ikatz/Development/non-wayfair/arduino_ci
33
specs:
4-
arduino_ci (0.0.1)
4+
arduino_ci (0.1.8)
55
os (~> 1.0)
66

77
GEM

exe/arduino_ci_remote.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def assure(message, &block)
117117
if cpp_library.test_files.empty?
118118
attempt("Skipping unit tests; no test files were found") { true }
119119
elsif config.platforms_to_unittest.empty?
120-
attempt("Skipping unit tests; no platforms were requestsed") { true }
120+
attempt("Skipping unit tests; no platforms were requested") { true }
121121
else
122122
config.platforms_to_unittest.each do |p|
123123
board = all_platforms[p][:board]
@@ -130,6 +130,7 @@ def assure(message, &block)
130130
exe = cpp_library.build_for_test_with_configuration(
131131
unittest_path,
132132
config.aux_libraries_for_unittest,
133+
gcc_binary,
133134
config.gcc_config(p)
134135
)
135136
puts

spec/testsomething_unittests_spec.rb

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
expect(config.compilers_to_use.length.zero?).to be(false)
3131
end
3232

33+
it "has at least one unit test platform defined" do
34+
expect(config.platforms_to_unittest.length.zero?).to be(false)
35+
end
36+
3337
test_files = config.allowable_unittest_files(cpp_library.test_files)
3438
test_files.each do |path|
3539
tfn = File.basename(path)

0 commit comments

Comments
 (0)