bullseye.rake in ceedling-0.0.8

- old
+ new

@@ -15,62 +15,62 @@
     proc do |task_name|
       @ceedling[:file_finder].find_compilation_input_file(task_name)
     end
   ]) do |object|
 
-  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|unity|cmock|cexception)/i)
+  if (File.basename(object.source) =~ /^(#{PROJECT_TEST_FILE_PREFIX}|#{CMOCK_MOCK_PREFIX}|#{BULLSEYE_IGNORE_SOURCES.join('|')})/i)
     @ceedling[:generator].generate_object_file(
       TOOLS_BULLSEYE_COMPILER,
-      BULLSEYE_CONTEXT,
+      BULLSEYE_SYM,
       object.source,
       object.name,
       @ceedling[:file_path_utils].form_test_build_list_filepath( object.name ) )
   else
-    @ceedling[BULLSEYE_CONTEXT].generate_coverage_object_file(object.source, object.name)
+    @ceedling[BULLSEYE_SYM].generate_coverage_object_file(object.source, object.name)
   end
 
 end
 
 rule(/#{BULLSEYE_BUILD_OUTPUT_PATH}\/#{'.+\\'+EXTENSION_EXECUTABLE}$/) do |bin_file|
   @ceedling[:generator].generate_executable_file(
     TOOLS_BULLSEYE_LINKER,
-    BULLSEYE_CONTEXT,
+    BULLSEYE_SYM,
     bin_file.prerequisites,
     bin_file.name,
     @ceedling[:file_path_utils].form_test_build_map_filepath(bin_file.name))
 end
 
 rule(/#{BULLSEYE_RESULTS_PATH}\/#{'.+\\'+EXTENSION_TESTPASS}$/ => [
      proc do |task_name|
        @ceedling[:file_path_utils].form_test_executable_filepath(task_name)
      end
   ]) do |test_result|
-  @ceedling[:generator].generate_test_results(TOOLS_BULLSEYE_FIXTURE, BULLSEYE_CONTEXT, test_result.source, test_result.name)
+  @ceedling[:generator].generate_test_results(TOOLS_BULLSEYE_FIXTURE, BULLSEYE_SYM, test_result.source, test_result.name)
 end
 
 rule(/#{BULLSEYE_DEPENDENCIES_PATH}\/#{'.+\\'+EXTENSION_DEPENDENCIES}$/ => [
     proc do |task_name|
       @ceedling[:file_finder].find_compilation_input_file(task_name)
     end
   ]) do |dep|
   @ceedling[:generator].generate_dependencies_file(
     TOOLS_TEST_DEPENDENCIES_GENERATOR,
-    BULLSEYE_CONTEXT,
+    BULLSEYE_SYM,
     dep.source,
     File.join(BULLSEYE_BUILD_OUTPUT_PATH, File.basename(dep.source).ext(EXTENSION_OBJECT) ),
     dep.name)
 end
 
 task :directories => [BULLSEYE_BUILD_OUTPUT_PATH, BULLSEYE_RESULTS_PATH, BULLSEYE_DEPENDENCIES_PATH, BULLSEYE_ARTIFACTS_PATH]
 
-namespace BULLSEYE_CONTEXT do
+namespace BULLSEYE_SYM do
 
   task :source_coverage => COLLECTION_ALL_SOURCE.pathmap("#{BULLSEYE_BUILD_OUTPUT_PATH}/%n#{@ceedling[:configurator].extension_object}")
 
   desc "Run code coverage for all tests"
   task :all => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS)
     @ceedling[:configurator].restore_config
   end
 
   desc "Run single test w/ coverage ([*] real test or source file name, no path)."
@@ -89,11 +89,11 @@
     COLLECTION_ALL_TESTS.each do |test|
       matches << test if test =~ /#{args.regex}/
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
       @ceedling[:streaminator].stdout_puts("\nFound no tests matching pattern /#{args.regex}/.")
     end
@@ -106,21 +106,21 @@
     COLLECTION_ALL_TESTS.each do |test|
       matches << test if File.dirname(test).include?(args.dir.gsub(/\\/, '/'))
     end
   
     if (matches.size > 0)
-      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+      @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
       @ceedling[:test_invoker].setup_and_invoke(matches, {:force_run => false})
       @ceedling[:configurator].restore_config
     else
       @ceedling[:streaminator].stdout_puts("\nFound no tests including the given path or path component.")
     end
   end
 
   desc "Run code coverage for changed files"
   task :delta => [:directories] do
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke(COLLECTION_ALL_TESTS, {:force_run => false})
     @ceedling[:configurator].restore_config
   end
   
   # use a rule to increase efficiency for large projects
@@ -131,20 +131,20 @@
         test = "#{PROJECT_TEST_FILE_PREFIX}#{test}" if not (test.start_with?(PROJECT_TEST_FILE_PREFIX))
         @ceedling[:file_finder].find_test_from_file_path(test)
       end
   ]) do |test|
     @ceedling[:rake_wrapper][:directories].invoke
-    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_CONTEXT].config)
+    @ceedling[:configurator].replace_flattened_config(@ceedling[BULLSEYE_SYM].config)
     @ceedling[:test_invoker].setup_and_invoke([test.source])
     @ceedling[:configurator].restore_config
   end
   
 end
 
 namespace UTILS_SYM do
   
   desc "Open Bullseye code coverage browser"
-  task BULLSEYE_CONTEXT do
+  task BULLSEYE_SYM do
     command = @ceedling[:tool_executor].build_command_line(TOOLS_BULLSEYE_BROWSER)
     @ceedling[:tool_executor].exec(command[:line], command[:options])
   end
   
 end