Address lint issues.

Author: jgfoster

exe/arduino_ci.rb

@@ -423,27 +423,24 @@ def perform_unit_tests(cpp_library, file_config)
     puts
     compilers.each do |gcc_binary|
       # before compiling the tests, build a shared library of everything except the test code
-      if build_shared_library(gcc_binary, p, config, cpp_library)
-        # now build and run each test using the shared library build above
-        config.allowable_unittest_files(cpp_library.test_files).each do |unittest_path|
-          unittest_name = unittest_path.basename.to_s
-          puts "--------------------------------------------------------------------------------"
-          attempt_multiline("Unit testing #{unittest_name} with #{gcc_binary} for #{p}") do
-            exe = cpp_library.build_for_test_with_configuration(
-              unittest_path,
-              config.aux_libraries_for_unittest,
-              gcc_binary,
-              config.gcc_config(p)
-            )
-            puts
-            unless exe
-              puts "Last command: #{cpp_library.last_cmd}"
-              puts cpp_library.last_out
-              puts cpp_library.last_err
-              next false
-            end
-            cpp_library.run_test_file(exe)
+      next unless build_shared_library(gcc_binary, p, config, cpp_library)
+      # now build and run each test using the shared library build above
+      config.allowable_unittest_files(cpp_library.test_files).each do |unittest_path|
+        unittest_name = unittest_path.basename.to_s
+        puts "--------------------------------------------------------------------------------"
+        attempt_multiline("Unit testing #{unittest_name} with #{gcc_binary} for #{p}") do
+          exe = cpp_library.build_for_test_with_configuration(
+            unittest_path,
+            gcc_binary
+          )
+          puts
+          unless exe
+            puts "Last command: #{cpp_library.last_cmd}"
+            puts cpp_library.last_out
+            puts cpp_library.last_err
+            next false
           end
+          cpp_library.run_test_file(exe)
         end
       end
     end

lib/arduino_ci/cpp_library.rb

@@ -9,9 +9,8 @@
 CI_CPP_DIR = Pathname.new(__dir__).parent.parent + "cpp"
 ARDUINO_HEADER_DIR = CI_CPP_DIR + "arduino"
 UNITTEST_HEADER_DIR = CI_CPP_DIR + "unittest"
-LIBRARY_NAME = "arduino"
-BUILD_DIR = "#{Dir.pwd}/.arduino_ci"    # hide build artifacts
-
+LIBRARY_NAME = "arduino".freeze
+BUILD_DIR = "#{Dir.pwd}/.arduino_ci".freeze    # hide build artifacts
 
 module ArduinoCI
 
@@ -492,7 +491,7 @@ def test_args(aux_libraries, ci_gcc_config)
     # @param aux_libraries [Array<Pathname>] The external Arduino libraries required by this project
     # @param ci_gcc_config [Hash] The GCC config object
     # @return [Pathname] path to the compiled test executable
-    def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_gcc_config)
+    def build_for_test_with_configuration(test_file, gcc_binary)
       executable = Pathname.new("#{BUILD_DIR}/#{test_file.basename}.bin").expand_path
       File.delete(executable) if File.exist?(executable)
       arg_sets = ["-std=c++0x", "-o", executable.to_s, "-L#{BUILD_DIR}", "-DARDUINO=100"]