ceedling 0.28.2 → 0.28.3

data/lib/ceedling/plugin_manager.rb

@@ -1,4 +1,3 @@
-require 'set'
 require 'ceedling/constants'
 
 class PluginManager
@@ -9,19 +8,19 @@ class PluginManager
     @build_fail_registry = []
     @plugin_objects = [] # so we can preserve order
   end
-  
+
   def load_plugin_scripts(script_plugins, system_objects)
     environment = []
-    
+
     script_plugins.each do |plugin|
       # protect against instantiating object multiple times due to processing config multiple times (option files, etc)
-			next if (@plugin_manager_helper.include?(@plugin_objects, plugin))
+      next if (@plugin_manager_helper.include?(@plugin_objects, plugin))
       begin
         @system_wrapper.require_file( "#{plugin}.rb" )
         object = @plugin_manager_helper.instantiate_plugin_script( camelize(plugin), system_objects, plugin )
         @plugin_objects << object
         environment += object.environment
-        
+
         # add plugins to hash of all system objects
         system_objects[plugin.downcase.to_sym] = object
       rescue
@@ -29,28 +28,28 @@ class PluginManager
         raise
       end
     end
-    
+
     yield( { :environment => environment } ) if (environment.size > 0)
   end
-  
+
   def plugins_failed?
     return (@build_fail_registry.size > 0)
   end
-  
+
   def print_plugin_failures
     if (@build_fail_registry.size > 0)
       report = @reportinator.generate_banner('BUILD FAILURE SUMMARY')
-      
+
       @build_fail_registry.each do |failure|
         report += "#{' - ' if (@build_fail_registry.size > 1)}#{failure}\n"
       end
-      
+
       report += "\n"
-      
+
       @streaminator.stderr_puts(report, Verbosity::ERRORS)
-    end    
+    end
   end
-  
+
   def register_build_failure(message)
     @build_fail_registry << message if (message and not message.empty?)
   end
@@ -81,14 +80,15 @@ class PluginManager
 
   def pre_release; execute_plugins(:pre_release); end
   def post_release; execute_plugins(:post_release); end
-  
+
   def pre_build; execute_plugins(:pre_build); end
   def post_build; execute_plugins(:post_build); end
-  
+  def post_error; execute_plugins(:post_error); end
+
   def summary; execute_plugins(:summary); end
-  
+
   private ####################################
-  
+
   def camelize(underscored_name)
     return underscored_name.gsub(/(_|^)([a-z0-9])/) {$2.upcase}
   end
@@ -96,7 +96,7 @@ class PluginManager
   def execute_plugins(method, *args)
     @plugin_objects.each do |plugin|
       begin
-        plugin.send(method, *args)
+        plugin.send(method, *args) if plugin.respond_to?(method)
       rescue
         puts "Exception raised in plugin: #{plugin.name}, in method #{method}"
         raise

data/lib/ceedling/plugin_reportinator.rb

@@ -68,8 +68,9 @@ class PluginReportinator
       :failures  => [],
       :ignores   => [],
       :stdout    => [],
-      :counts    => {:total => 0, :passed => 0, :failed => 0, :ignored  => 0, :stdout => 0}
+      :counts    => {:total => 0, :passed => 0, :failed => 0, :ignored  => 0, :stdout => 0},
+      :time      => 0.0
       }
   end
  
-end
+end

data/lib/ceedling/plugin_reportinator_helper.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'rake' # for ext()
 require 'ceedling/constants'
 
-
 class PluginReportinatorHelper
   
   attr_writer :ceedling
@@ -31,7 +30,6 @@ class PluginReportinatorHelper
 
   def process_results(aggregate_results, results)
     return if (results.empty?)
-  
     aggregate_results[:successes]        << { :source => results[:source].clone, :collection => results[:successes].clone } if (results[:successes].size > 0)
     aggregate_results[:failures]         << { :source => results[:source].clone, :collection => results[:failures].clone  } if (results[:failures].size > 0)
     aggregate_results[:ignores]          << { :source => results[:source].clone, :collection => results[:ignores].clone   } if (results[:ignores].size > 0)
@@ -41,6 +39,7 @@ class PluginReportinatorHelper
     aggregate_results[:counts][:failed]  += results[:counts][:failed]
     aggregate_results[:counts][:ignored] += results[:counts][:ignored]
     aggregate_results[:counts][:stdout]  += results[:stdout].size
+    aggregate_results[:time] += results[:time]
   end
 
 
@@ -49,4 +48,4 @@ class PluginReportinatorHelper
     @streaminator.stream_puts(stream, output.result(binding()), verbosity)
   end
   
-end
+end

data/lib/ceedling/preprocessinator_extractor.rb

@@ -16,13 +16,13 @@ class PreprocessinatorExtractor
 
     lines = []
     File.readlines(filepath).each do |line|
-      if found_file and not line.match(not_pragma)
+      if found_file and not line =~ not_pragma
         lines << line
       else
         found_file = false
       end
 
-      found_file = true if line.match(pattern)
+      found_file = true if line =~ pattern
     end
 
     return lines

data/lib/ceedling/preprocessinator_includes_handler.rb

@@ -30,6 +30,11 @@ class PreprocessinatorIncludesHandler
     # that winds through the code). The decorated filenames indicate files that
     # are included directly by the test file.
     contents = @file_wrapper.read(filepath)
+
+    if !contents.valid_encoding?
+      contents = contents.encode("UTF-16be", :invalid=>:replace, :replace=>"?").encode('UTF-8')
+    end
+
     contents.gsub!( /^\s*#include\s+[\"<]\s*(\S+)\s*[\">]/, "#include \"\\1\"\n#include \"@@@@\\1\"" )
     contents.gsub!( /^\s*TEST_FILE\(\s*\"\s*(\S+)\s*\"\s*\)/, "#include \"\\1\"\n#include \"@@@@\\1\"")
     @file_wrapper.write( temp_filepath, contents )

data/lib/ceedling/rakefile.rb

@@ -81,5 +81,6 @@ END {
     exit(1) if (@ceedling[:plugin_manager].plugins_failed? && !@ceedling[:setupinator].config_hash[:graceful_fail])
   else
     puts "ERROR: Ceedling Failed"
+    @ceedling[:plugin_manager].post_error
   end
 }

data/lib/ceedling/release_invoker_helper.rb

@@ -8,8 +8,11 @@ class ReleaseInvokerHelper
   def process_deep_dependencies(dependencies_list)
     return if (not @configurator.project_use_deep_dependencies)
 
-    @dependinator.enhance_release_file_dependencies( dependencies_list )
-    @task_invoker.invoke_release_dependencies_files( dependencies_list )
+    if @configurator.project_generate_deep_dependencies
+      @dependinator.enhance_release_file_dependencies( dependencies_list )
+      @task_invoker.invoke_release_dependencies_files( dependencies_list )
+    end
+
     @dependinator.load_release_object_deep_dependencies( dependencies_list )
   end
 

data/lib/ceedling/rules_release.rake

@@ -30,7 +30,8 @@ rule(/#{PROJECT_RELEASE_BUILD_OUTPUT_C_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
     RELEASE_SYM,
     object.source,
     object.name,
-    @ceedling[:file_path_utils].form_release_build_c_list_filepath( object.name ) )
+    @ceedling[:file_path_utils].form_release_build_c_list_filepath( object.name ),
+    @ceedling[:file_path_utils].form_release_dependencies_filepath( object.name ) )
 end
 
 

data/lib/ceedling/rules_tests.rake

@@ -8,19 +8,28 @@ rule(/#{PROJECT_TEST_FILE_PREFIX}#{'.+'+TEST_RUNNER_FILE_SUFFIX}#{'\\'+EXTENSION
   @ceedling[:generator].generate_test_runner(TEST_SYM, runner.source, runner.name)
 end
 
-
-rule(/#{PROJECT_TEST_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
+rule(/#{PROJECT_TEST_BUILD_OUTPUT_C_PATH}\/#{'.+\\'+EXTENSION_OBJECT}$/ => [
     proc do |task_name|
       @ceedling[:file_finder].find_compilation_input_file(task_name)
     end
   ]) do |object|
-  @ceedling[:generator].generate_object_file(
-    TOOLS_TEST_COMPILER,
-    OPERATION_COMPILE_SYM,
-    TEST_SYM,
-    object.source,
-    object.name,
-    @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
+  if (File.basename(object.source) =~ /#{EXTENSION_SOURCE}$/)
+    @ceedling[:generator].generate_object_file(
+      TOOLS_TEST_COMPILER,
+      OPERATION_COMPILE_SYM,
+      TEST_SYM,
+      object.source,
+      object.name,
+      @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ),
+      @ceedling[:file_path_utils].form_test_dependencies_filepath( object.name ))
+  elsif (defined?(TEST_BUILD_USE_ASSEMBLY) && TEST_BUILD_USE_ASSEMBLY)
+    @ceedling[:generator].generate_object_file(
+      TOOLS_TEST_ASSEMBLER,
+      OPERATION_ASSEMBLE_SYM,
+      TEST_SYM,
+      object.source,
+      object.name )
+  end
 end
 
 

data/lib/ceedling/rules_tests_deep_dependencies.rake

@@ -3,13 +3,13 @@
 rule(/#{PROJECT_TEST_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
     proc do |task_name|
       @ceedling[:file_finder].find_compilation_input_file(task_name)
-    end  
+    end
   ]) do |dep|
   @ceedling[:generator].generate_dependencies_file(
   	TOOLS_TEST_DEPENDENCIES_GENERATOR,
     TEST_SYM,
   	dep.source,
-  	@ceedling[:file_path_utils].form_test_build_object_filepath(dep.source),
+  	@ceedling[:file_path_utils].form_test_build_c_object_filepath(dep.source),
   	dep.name)
 end
 

data/lib/ceedling/task_invoker.rb

@@ -56,17 +56,29 @@ class TaskInvoker
 
   def invoke_test_shallow_include_lists(files)
     @dependinator.enhance_shallow_include_lists_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
+    par_map(PROJECT_COMPILE_THREADS, files) do |file|
+      @rake_wrapper[file].invoke
+    end
   end
 
   def invoke_test_preprocessed_files(files)
     @dependinator.enhance_preprocesed_file_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
+    par_map(PROJECT_COMPILE_THREADS, files) do |file|
+      @rake_wrapper[file].invoke
+    end
   end
 
   def invoke_test_dependencies_files(files)
     @dependinator.enhance_dependencies_dependencies( files )
-    files.each { |file| @rake_wrapper[file].invoke }
+    par_map(PROJECT_COMPILE_THREADS, files) do |file|
+      @rake_wrapper[file].invoke
+    end
+  end
+
+  def invoke_test_objects(objects)
+    par_map(PROJECT_COMPILE_THREADS, objects) do |object|
+       @rake_wrapper[object].invoke
+    end
   end
 
   def invoke_test_results(result)

data/lib/ceedling/tasks_vendor.rake

@@ -4,7 +4,7 @@ require 'ceedling/file_path_utils'
 # create file dependencies to ensure C-based components of vendor tools are recompiled when they are updated with new versions
 # forming these explicitly rather than depend on auxiliary dependencies so all scenarios are explicitly covered
 
-file( @ceedling[:file_path_utils].form_test_build_object_filepath( UNITY_C_FILE ) => [
+file( @ceedling[:file_path_utils].form_test_build_c_object_filepath( UNITY_C_FILE ) => [
   File.join( UNITY_VENDOR_PATH, UNITY_LIB_PATH, UNITY_C_FILE ),
   File.join( UNITY_VENDOR_PATH, UNITY_LIB_PATH, UNITY_H_FILE ),
   File.join( UNITY_VENDOR_PATH, UNITY_LIB_PATH, UNITY_INTERNALS_H_FILE ) ]
@@ -12,7 +12,7 @@ file( @ceedling[:file_path_utils].form_test_build_object_filepath( UNITY_C_FILE
 
 
 if (PROJECT_USE_MOCKS)
-file( @ceedling[:file_path_utils].form_test_build_object_filepath( CMOCK_C_FILE ) => [
+file( @ceedling[:file_path_utils].form_test_build_c_object_filepath( CMOCK_C_FILE ) => [
   File.join( CMOCK_VENDOR_PATH, CMOCK_LIB_PATH, CMOCK_C_FILE ),
   File.join( CMOCK_VENDOR_PATH, CMOCK_LIB_PATH, CMOCK_H_FILE ) ]
   )
@@ -20,7 +20,7 @@ end
 
 
 if (PROJECT_USE_EXCEPTIONS)
-file( @ceedling[:file_path_utils].form_test_build_object_filepath( CEXCEPTION_C_FILE ) => [
+file( @ceedling[:file_path_utils].form_test_build_c_object_filepath( CEXCEPTION_C_FILE ) => [
   File.join( CEXCEPTION_VENDOR_PATH, CEXCEPTION_LIB_PATH, CEXCEPTION_C_FILE ),
   File.join( CEXCEPTION_VENDOR_PATH, CEXCEPTION_LIB_PATH, CEXCEPTION_H_FILE ) ]
   )

data/lib/ceedling/test_invoker.rb

@@ -22,7 +22,7 @@ class TestInvoker
     @tests   = []
     @mocks   = []
   end
-  
+
   def get_test_definition_str(test)
     return "-D" + File.basename(test, File.extname(test)).upcase.sub(/@.*$/, "")
   end
@@ -55,11 +55,11 @@ class TestInvoker
   end
 
   def setup_and_invoke(tests, context=TEST_SYM, options={:force_run => true})
-  
+
     @tests = tests
 
     @project_config_manager.process_test_config_change
-  
+
     @tests.each do |test|
       # announce beginning of test run
       header = "Test '#{File.basename(test)}'"
@@ -67,7 +67,23 @@ class TestInvoker
 
       begin
         @plugin_manager.pre_test( test )
-        
+        test_name ="#{File.basename(test)}".chomp('.c')
+        def_test_key="defines_#{test_name}"
+
+        # Re-define the project out path and pre-processor defines.
+        if @configurator.project_config_hash.has_key?(def_test_key.to_sym)
+          @project_config_manager.test_config_changed
+          defs_bkp = Array.new(COLLECTION_DEFINES_TEST_AND_VENDOR)
+          printf " ************** Specific test definitions for #{test_name} !!! \n"
+          tst_defs_cfg = @configurator.project_config_hash[def_test_key.to_sym]
+
+          orig_path = @configurator.project_test_build_output_path
+          @configurator.project_config_hash[:project_test_build_output_path] = File.join(@configurator.project_test_build_output_path, test_name)
+          @file_wrapper.mkdir(@configurator.project_test_build_output_path)
+          COLLECTION_DEFINES_TEST_AND_VENDOR.replace(tst_defs_cfg)
+          # printf " *  new defines = #{COLLECTION_DEFINES_TEST_AND_VENDOR}\n"
+        end
+
         # collect up test fixture pieces & parts
         runner       = @file_path_utils.form_runner_filepath_from_test( test )
         mock_list    = @preprocessinator.preprocess_test_and_invoke_test_mocks( test )
@@ -77,7 +93,7 @@ class TestInvoker
         objects      = @file_path_utils.form_test_build_objects_filelist( [runner] + core + extras )
         results_pass = @file_path_utils.form_pass_results_filepath( test )
         results_fail = @file_path_utils.form_fail_results_filepath( test )
-        
+
         # add the definition value in the build option for the unit test
         if @configurator.defines_use_test_definition
           add_test_definition(test)
@@ -87,7 +103,7 @@ class TestInvoker
         @test_invoker_helper.clean_results( {:pass => results_pass, :fail => results_fail}, options )
 
         # load up auxiliary dependencies so deep changes cause rebuilding appropriately
-        @test_invoker_helper.process_deep_dependencies( core ) do |dependencies_list| 
+        @test_invoker_helper.process_deep_dependencies( core ) do |dependencies_list|
           @dependinator.load_test_object_deep_dependencies( dependencies_list )
         end
 
@@ -100,8 +116,11 @@ class TestInvoker
         # associate object files with executable
         @dependinator.setup_test_executable_dependencies( test, objects )
 
+        # build test objects
+        @task_invoker.invoke_test_objects( objects )
+
         # 3, 2, 1... launch
-        @task_invoker.invoke_test_results( results_pass )        
+        @task_invoker.invoke_test_results( results_pass )
       rescue => e
         @build_invoker_utils.process_exception( e, context )
       ensure
@@ -110,8 +129,16 @@ class TestInvoker
           delete_test_definition(test)
         end
         @plugin_manager.post_test( test )
+        # restore the project test defines
+        if @configurator.project_config_hash.has_key?(def_test_key.to_sym)
+          # @configurator.project_config_hash[:defines_test] =
+          COLLECTION_DEFINES_TEST_AND_VENDOR.replace(defs_bkp)
+          # printf " ---- Restored defines at #{defs_bkp}"
+          @configurator.project_config_hash[:project_test_build_output_path] = orig_path
+          printf " ************** Restored defines and build path\n"
+        end
       end
-      
+
       # store away what's been processed
       @mocks.concat( mock_list )
       @sources.concat( sources )
@@ -119,18 +146,18 @@ class TestInvoker
 
     # post-process collected mock list
     @mocks.uniq!
-    
+
     # post-process collected sources list
     @sources.uniq!
   end
 
 
   def refresh_deep_dependencies
-    @file_wrapper.rm_f( 
-      @file_wrapper.directory_listing( 
+    @file_wrapper.rm_f(
+      @file_wrapper.directory_listing(
         File.join( @configurator.project_test_dependencies_path, '*' + @configurator.extension_dependencies ) ) )
 
-    @test_invoker_helper.process_deep_dependencies( 
+    @test_invoker_helper.process_deep_dependencies(
       @configurator.collection_all_tests + @configurator.collection_all_source )
   end
 

data/lib/ceedling/test_invoker_helper.rb

@@ -12,7 +12,11 @@ class TestInvokerHelper
     return if (not @configurator.project_use_deep_dependencies)
 
     dependencies_list = @file_path_utils.form_test_dependencies_filelist( files )
-    @task_invoker.invoke_test_dependencies_files( dependencies_list )
+
+    if @configurator.project_generate_deep_dependencies
+      @task_invoker.invoke_test_dependencies_files( dependencies_list )
+    end
+
     yield( dependencies_list ) if block_given?
   end
   

data/lib/ceedling/tool_executor.rb

@@ -1,4 +1,5 @@
 require 'ceedling/constants'
+require 'benchmark'
 
 class ShellExecutionException < RuntimeError
   attr_reader :shell_result
@@ -62,11 +63,14 @@ class ToolExecutor
     shell_result = {}
 
     # depending on background exec option, we shell out differently
-    if (options[:background_exec] != BackgroundExec::NONE)
-      shell_result = @system_wrapper.shell_system( command_line, options[:boom] )
-    else
-      shell_result = @system_wrapper.shell_backticks( command_line, options[:boom] )
+    time = Benchmark.realtime do
+      if (options[:background_exec] != BackgroundExec::NONE)
+        shell_result = @system_wrapper.shell_system( command_line, options[:boom] )
+      else
+        shell_result = @system_wrapper.shell_backticks( command_line, options[:boom] )
+      end
     end
+    shell_result[:time] = time
 
     #scrub the string for illegal output
     shell_result[:output].scrub! unless (!("".respond_to? :scrub!) || (shell_result[:output].nil?))