From a5c2d231df5c4dfcd1d8857d81d30173289ed102 Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 12 Oct 2020 14:32:46 -0700 Subject: [PATCH 1/3] Don't define `ARDUINO=100` if already defined as something else. --- CHANGELOG.md | 1 + lib/arduino_ci/cpp_library.rb | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfeb713c..0ef2d3f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb index 4fbb43d0..549eeb1e 100644 --- a/lib/arduino_ci/cpp_library.rb +++ b/lib/arduino_ci/cpp_library.rb @@ -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", @@ -334,6 +334,9 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g ] end arg_sets << test_args(aux_libraries, ci_gcc_config) + if (arg_sets.flatten(1).index{|s| s.include?("-DARDUINO=")} == nil) + arg_sets << ["-DARDUINO=100"] + end arg_sets << cpp_files_libraries(aux_libraries).map(&:to_s) arg_sets << [test_file.to_s] args = arg_sets.flatten(1) From 4fdd2a02453b8d0265eaa256cc42094ed73ff8ec Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 12 Oct 2020 16:09:28 -0700 Subject: [PATCH 2/3] Attempt format cleanup. --- lib/arduino_ci/cpp_library.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb index 549eeb1e..51ff56f5 100644 --- a/lib/arduino_ci/cpp_library.rb +++ b/lib/arduino_ci/cpp_library.rb @@ -334,9 +334,9 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g ] end arg_sets << test_args(aux_libraries, ci_gcc_config) - if (arg_sets.flatten(1).index{|s| s.include?("-DARDUINO=")} == nil) - arg_sets << ["-DARDUINO=100"] - end + index = arg_sets.flatten(1).index { |s| s.include?("-DARDUINO=") } + arg_sets << ["-DARDUINO=100"] if index.nil? + end arg_sets << cpp_files_libraries(aux_libraries).map(&:to_s) arg_sets << [test_file.to_s] args = arg_sets.flatten(1) From 89cff264969beeaee75eeae06e9536d281a62e26 Mon Sep 17 00:00:00 2001 From: James Foster Date: Mon, 12 Oct 2020 16:12:54 -0700 Subject: [PATCH 3/3] Remove extra `end` --- lib/arduino_ci/cpp_library.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/arduino_ci/cpp_library.rb b/lib/arduino_ci/cpp_library.rb index 51ff56f5..39a8ce76 100644 --- a/lib/arduino_ci/cpp_library.rb +++ b/lib/arduino_ci/cpp_library.rb @@ -336,7 +336,6 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g 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? - end arg_sets << cpp_files_libraries(aux_libraries).map(&:to_s) arg_sets << [test_file.to_s] args = arg_sets.flatten(1)