Merge branch 'cmd_line_defines' into client_server

Author: James Foster

Diff for: lib/arduino_ci/cpp_library.rb

@@ -334,9 +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)
-      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?
       arg_sets << cpp_files_libraries(aux_libraries).map(&:to_s)
       arg_sets << [test_file.to_s]
       args = arg_sets.flatten(1)