factor out gcc args

Author: ianfixes

lib/arduino_ci/ci_config.rb

@@ -174,6 +174,38 @@ def aux_libraries_for_unittest
       @unittest_info[:libraries]
     end
 
+    def features(platform_name)
+      plat = @platform_info[platform_name]
+      return [] if plat.nil?
+      return [] if plat[:gcc].nil?
+      return [] if plat[:gcc][:features].nil?
+      plat[:gcc][:features]
+    end
+
+    def warnings(platform_name)
+      plat = @platform_info[platform_name]
+      return [] if plat.nil?
+      return [] if plat[:gcc].nil?
+      return [] if plat[:gcc][:warnings].nil?
+      plat[:gcc][:warnings]
+    end
+
+    def flags(platform_name)
+      plat = @platform_info[platform_name]
+      return [] if plat.nil?
+      return [] if plat[:gcc].nil?
+      return [] if plat[:gcc][:flags].nil?
+      plat[:gcc][:flags]
+    end
+
+    def defines(platform_name)
+      plat = @platform_info[platform_name]
+      return [] if plat.nil?
+      return [] if plat[:gcc].nil?
+      return [] if plat[:gcc][:flags].nil?
+      plat[:gcc][:flags]
+    end
+
   end
 
 end

lib/arduino_ci/cpp_library.rb

@@ -61,20 +61,63 @@ def run_gcc(*args, **kwargs)
       Host.run(*full_args, **kwargs)
     end
 
-    def test_args
-      ["-I#{UNITTEST_HEADER_DIR}"] + build_args + cpp_files_arduino + cpp_files_unittest + cpp_files
+    # GCC command line arguments for including aux libraries
+    def include_args(aux_libraries)
+      places = [ARDUINO_HEADER_DIR, UNITTEST_HEADER_DIR] + header_dirs + aux_libraries
+      places.map { |d| "-I#{d}" }
     end
 
-    def test(test_file)
+    # GCC command line arguments for features (e.g. -fno-weak)
+    def feature_args(ci_gcc_config)
+      return [] if ci_gcc_config[:features].nil?
+      ci_gcc_config[:features].map { |f| "-f#{f}" }
+    end
+
+    # GCC command line arguments for warning (e.g. -Wall)
+    def warning_args(ci_gcc_config)
+      return [] if ci_gcc_config[:warnings].nil?
+      ci_gcc_config[:features].map { |w| "-W#{w}" }
+    end
+
+    # GCC command line arguments for defines (e.g. -Dhave_something)
+    def define_args(ci_gcc_config)
+      return [] if ci_gcc_config[:defines].nil?
+      ci_gcc_config[:defines].map { |d| "-D#{d}" }
+    end
+
+    # GCC command line arguments as-is
+    def flag_args(ci_gcc_config)
+      return [] if ci_gcc_config[:flags].nil?
+      ci_gcc_config[:flags]
+    end
+
+    # All GCC command line args for building any unit test
+    def test_args(aux_libraries, ci_gcc_config)
+      # TODO: something with libraries?
+      cgc = ci_gcc_config
+      ret = include_args(aux_libraries) + cpp_files_arduino + cpp_files_unittest + cpp_files
+      unless ci_gcc_config.nil?
+        ret = feature_args(cgc) + warning_args(cgc) + define_args(cgc) + flag_args(cgc) + ret
+      end
+      ret
+    end
+
+    # run a test of the given unit test file
+    def test_with_configuration(test_file, aux_libraries, ci_gcc_config)
       base = File.basename(test_file)
       executable = File.expand_path("unittest_#{base}.bin")
       File.delete(executable) if File.exist?(executable)
-      args = ["-o", executable] + test_args + [test_file]
+      args = ["-o", executable] + test_args(aux_libraries, ci_gcc_config) + [test_file]
       return false unless run_gcc(*args)
       artifacts << executable
       Host.run(executable)
     end
 
+    # legacy shortcut for rspec
+    def test(test_file)
+      test_with_configuration(test_file, [], nil)
+    end
+
   end
 
 end