Skip to content
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

Don't define ARDUINO=100 if already defined as something else #179

Closed
wants to merge 3 commits into from
Closed

Don't define ARDUINO=100 if already defined as something else #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5c2d23
Don't define `ARDUINO=100` if already defined as something else.
Oct 12, 2020
4fdd2a0
Attempt format cleanup.
Oct 12, 2020
89cff26
Remove extra `end`
Oct 12, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed
- Don't define `ostream& operator<<(nullptr_t)` if already defined by Apple
- Don't define `ARDUINO=100` if already defined as something else

### Security

Expand Down
4 changes: 3 additions & 1 deletion lib/arduino_ci/cpp_library.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
executable = Pathname.new("unittest_#{base}.bin").expand_path
File.delete(executable) if File.exist?(executable)
arg_sets = []
arg_sets << ["-std=c++0x", "-o", executable.to_s, "-DARDUINO=100"]
arg_sets << ["-std=c++0x", "-o", executable.to_s]
if libasan?(gcc_binary)
arg_sets << [ # Stuff to help with dynamic memory mishandling
"-g", "-O1",
Expand All @@ -334,6 +334,8 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
]
end
arg_sets << test_args(aux_libraries, ci_gcc_config)
index = arg_sets.flatten(1).index { |s| s.include?("-DARDUINO=") }
arg_sets << ["-DARDUINO=100"] if index.nil?
arg_sets << cpp_files_libraries(aux_libraries).map(&:to_s)
arg_sets << [test_file.to_s]
args = arg_sets.flatten(1)
Expand Down