ceedling 1.2.1 → 1.2.2

data/spec/units/generators/generator_test_results_backtrace_spec.rb

@@ -142,7 +142,7 @@ describe GeneratorTestResultsBacktrace do
     @tool_executor           = instance_double('ToolExecutor')
     @generator_test_results  = instance_double('GeneratorTestResults')
     @file_path_utils         = instance_double('FilePathUtils')
-    @file_wrapper            = instance_double('FileWrapper')
+    @build_log_writer        = instance_double('BuildLogWriter')
     @loginator               = double('loginator').as_null_object
     # A real GeneratorHelper, not a double -- these tests exercise the actual crash
     # detection logic a retry's status is checked against, not a stubbed stand-in for it.
@@ -154,7 +154,7 @@ describe GeneratorTestResultsBacktrace do
       :generator_test_results => @generator_test_results,
       :generator_helper       => @generator_helper,
       :file_path_utils        => @file_path_utils,
-      :file_wrapper           => @file_wrapper,
+      :build_log_writer       => @build_log_writer,
       :loginator              => @loginator
     })
     @backtrace.setup()
@@ -170,11 +170,15 @@ describe GeneratorTestResultsBacktrace do
     allow(@file_path_utils).to receive(:form_test_gdb_log) do |test, context:, name:|
       "/build/logs/#{context}/#{test}/#{name}.gdb.log"
     end
-    allow(@file_wrapper).to receive(:mkdir)
-    allow(@file_wrapper).to receive(:write)
+    allow(@build_log_writer).to receive(:write)
     allow(@generator_test_results).to receive(:regenerate_test_executable_stdout).and_return('regenerated')
   end
 
+  # A test is named by its path from the project root
+  def test_name_of(filename)
+    return "test/#{File.basename( filename, '.*' )}"
+  end
+
   # ── #do_gdb ────────────────────────────────────────────────────────────────
 
   describe '#do_gdb' do
@@ -203,7 +207,7 @@ describe GeneratorTestResultsBacktrace do
           time: 0.1, exit_code: 0, stderr: '', status: @ok_status }
       )
 
-      expect(@file_wrapper).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything, anything)
+      expect(@build_log_writer).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything)
 
       expected_output_lines = []
       allow(@generator_test_results).to receive(:regenerate_test_executable_stdout) do |**kwargs|
@@ -211,7 +215,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(expected_output_lines).to include('test_lib.c:9:test_asserting:PASS')
     end
@@ -223,7 +227,7 @@ describe GeneratorTestResultsBacktrace do
           time: 0.1, exit_code: 0, stderr: '', status: @ok_status }
       )
 
-      expect(@file_wrapper).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything, anything)
+      expect(@build_log_writer).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything)
 
       expected_output_lines = []
       allow(@generator_test_results).to receive(:regenerate_test_executable_stdout) do |**kwargs|
@@ -231,7 +235,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(expected_output_lines).to include('test_lib.c:9:test_asserting:IGNORE')
     end
@@ -243,7 +247,7 @@ describe GeneratorTestResultsBacktrace do
           time: 0.1, exit_code: 1, stderr: '', status: @ok_status }
       )
 
-      expect(@file_wrapper).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything, anything)
+      expect(@build_log_writer).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything)
 
       expected_output_lines = []
       allow(@generator_test_results).to receive(:regenerate_test_executable_stdout) do |**kwargs|
@@ -251,7 +255,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(expected_output_lines).to include('test_lib.c:9:test_asserting:FAIL: Expected 1 Was 2')
     end
@@ -259,7 +263,7 @@ describe GeneratorTestResultsBacktrace do
     # Ignored-crash false positive: a TEST_IGNORE_MESSAGE(...) test case carries a
     # trailing message, same as FAIL. Before this fix, only FAIL tolerated one --
     # a message-carrying IGNORE fell through to "unresolved" and was misreported
-    # as crash evidence (a second @file_wrapper.write, for a companion_case that
+    # as crash evidence (a second log write, for a companion_case that
     # never actually crashed).
     it 'handles an IGNORE test case with a trailing message and does not write a log' do
       allow(@tool_executor).to receive(:exec).and_return(
@@ -268,7 +272,7 @@ describe GeneratorTestResultsBacktrace do
           time: 0.1, exit_code: 0, stderr: '', status: @ok_status }
       )
 
-      expect(@file_wrapper).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything, anything)
+      expect(@build_log_writer).to receive(:write).once.with(%r{test_crashes_elsewhere}, anything)
 
       expected_output_lines = []
       allow(@generator_test_results).to receive(:regenerate_test_executable_stdout) do |**kwargs|
@@ -276,7 +280,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, [companion_case] + test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(expected_output_lines).to include('test_lib.c:9:test_asserting:IGNORE: Not yet implemented')
     end
@@ -297,7 +301,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      result = @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test )
+      result = @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(result[:exit_code]).to eq(1)
       expect(expected_output_lines.first).to include(':FAIL:')
@@ -317,7 +321,7 @@ describe GeneratorTestResultsBacktrace do
         .with(filename, shell_result, test_cases)
         .and_return(fallback_result)
 
-      result = @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test )
+      result = @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(result).to eq(fallback_result)
     end
@@ -335,17 +339,17 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      expect(@file_wrapper).to receive(:write)
-        .with('/build/logs/test/TestUsartModel/testCrash.gdb.log', /=== testCrash ===/, 'a')
+      expect(@build_log_writer).to receive(:write)
+        .with('/build/logs/test/test/TestUsartModel/testCrash.gdb.log', /=== testCrash ===/)
 
-      @backtrace.do_gdb( filename_sigsegv, executable, shell_result, test_cases_sigsegv, context: :test )
+      @backtrace.do_gdb( filename_sigsegv, executable, shell_result, test_cases_sigsegv, context: :test, test_name: test_name_of( filename_sigsegv ) )
 
       crash_line = expected_output_lines.first
       expect(crash_line).to include('>> [SIGSEGV] Segmentation fault')
       expect(crash_line).not_to include('testCrash() at TestUsartModel.c:40')
       expect(crash_line).to include("#{NEWLINE_TOKEN}`uint32_t i = *null_ptr;`")
       expect(crash_line).not_to include('(log: ')
-      expect(crash_line).to include('(/build/logs/test/TestUsartModel/testCrash.gdb.log)')
+      expect(crash_line).to include('(/build/logs/test/test/TestUsartModel/testCrash.gdb.log)')
     end
 
     it 'attributes a crash in a parameterized test to its wrapper symbol, not its display name' do
@@ -365,10 +369,10 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      expect(@file_wrapper).to receive(:write)
-        .with('/build/logs/test/test_module_d/test_value_out_of_range_good(101, 1).gdb.log', /=== test_value_out_of_range_good\(101, 1\) ===/, 'a')
+      expect(@build_log_writer).to receive(:write)
+        .with('/build/logs/test/test/test_module_d/test_value_out_of_range_good(101, 1).gdb.log', /=== test_value_out_of_range_good\(101, 1\) ===/)
 
-      @backtrace.do_gdb( filename_param, executable, shell_result, test_cases_param, context: :test )
+      @backtrace.do_gdb( filename_param, executable, shell_result, test_cases_param, context: :test, test_name: test_name_of( filename_param ) )
 
       crash_line = expected_output_lines.first
       # The FAIL line reports the human-facing display name (with args)...
@@ -399,10 +403,10 @@ describe GeneratorTestResultsBacktrace do
       allow(@tool_executor).to receive(:exec)
         .and_return({ output: crash_output, time: 0.5, exit_code: 139, stderr: '', status: @ok_status })
 
-      expect(@file_wrapper).to receive(:write)
-        .with('/build/logs/test/test_module/test_x(2).gdb.log', /=== test_x\(2\) ===/, 'a')
+      expect(@build_log_writer).to receive(:write)
+        .with('/build/logs/test/test/test_module/test_x(2).gdb.log', /=== test_x\(2\) ===/)
 
-      @backtrace.do_gdb( filename_suffix, executable, shell_result, test_cases_suffix, context: :test )
+      @backtrace.do_gdb( filename_suffix, executable, shell_result, test_cases_suffix, context: :test, test_name: test_name_of( filename_suffix ) )
     end
 
     it 'handles a SIGABRT crash from assert() — shows assertion text, no source line' do
@@ -417,7 +421,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, test_cases_assert, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, test_cases_assert, context: :test, test_name: test_name_of( filename ) )
 
       crash_line = expected_output_lines.first
       expect(crash_line).to include('>> [SIGABRT]')
@@ -425,7 +429,7 @@ describe GeneratorTestResultsBacktrace do
       expect(crash_line).not_to include('Aborted')
       expect(crash_line).not_to include('asserting() at lib.c:5')
       expect(crash_line).not_to include('(log: ')
-      expect(crash_line).to include('(/build/logs/test/test_lib/test_asserting.gdb.log)')
+      expect(crash_line).to include('(/build/logs/test/test/test_lib/test_asserting.gdb.log)')
     end
 
     it 'handles a crash with no identifiable signal — fallback message, log path without "log: " prefix' do
@@ -438,12 +442,12 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test, test_name: test_name_of( filename ) )
 
       crash_line = expected_output_lines.first
       expect(crash_line).not_to include(' >> ')
       expect(crash_line).not_to include('(log: ')
-      expect(crash_line).to include('(/build/logs/test/test_lib/test_asserting.gdb.log)')
+      expect(crash_line).to include('(/build/logs/test/test/test_lib/test_asserting.gdb.log)')
     end
 
     # A crashed test case that resolves to no useful gdb report is worth flagging on
@@ -458,7 +462,7 @@ describe GeneratorTestResultsBacktrace do
       expect(@loginator).to receive(:log)
         .with(a_string_including('test_asserting'), Verbosity::COMPLAIN)
 
-      @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result, test_cases, context: :test, test_name: test_name_of( filename ) )
     end
   end
 
@@ -489,8 +493,8 @@ describe GeneratorTestResultsBacktrace do
       allow(@tool_executor).to receive(:exec)
         .and_return({ output: GDB_NO_SIGNAL_OUTPUT, time: 0.1, exit_code: 1, stderr: '', status: @ok_status })
 
-      @backtrace.do_gdb( 'test_lib.c', executable, shell_result.dup, test_cases, context: :test )
-      @backtrace.do_gdb( 'test_module.c', executable, shell_result.dup, test_cases, context: :test )
+      @backtrace.do_gdb( 'test_lib.c', executable, shell_result.dup, test_cases, context: :test, test_name: test_name_of( 'test_lib.c' ) )
+      @backtrace.do_gdb( 'test_module.c', executable, shell_result.dup, test_cases, context: :test, test_name: test_name_of( 'test_module.c' ) )
 
       expect(@loginator).to receive(:log)
         .with(a_string_including('test suite run'), Verbosity::ERRORS, LogLabels::WARNING).once
@@ -504,12 +508,12 @@ describe GeneratorTestResultsBacktrace do
       )
       @backtrace.do_gdb(
         'TestUsartModel.c', executable, shell_result.dup,
-        [{ test: 'testCrash', symbol: 'testCrash', line_number: 37 }], context: :test
+        [{ test: 'testCrash', symbol: 'testCrash', line_number: 37 }], context: :test, test_name: test_name_of( 'TestUsartModel.c' )
       )
 
       allow(@tool_executor).to receive(:exec)
         .and_return({ output: GDB_NO_SIGNAL_OUTPUT, time: 0.1, exit_code: 1, stderr: '', status: @ok_status })
-      @backtrace.do_gdb( 'test_lib.c', executable, shell_result.dup, test_cases, context: :test )
+      @backtrace.do_gdb( 'test_lib.c', executable, shell_result.dup, test_cases, context: :test, test_name: test_name_of( 'test_lib.c' ) )
 
       expect(@loginator).to_not receive(:log)
         .with(anything, Verbosity::ERRORS, LogLabels::WARNING)
@@ -520,7 +524,7 @@ describe GeneratorTestResultsBacktrace do
     it 'only flushes once -- a second call logs nothing further without a new crash' do
       allow(@tool_executor).to receive(:exec)
         .and_return({ output: GDB_NO_SIGNAL_OUTPUT, time: 0.1, exit_code: 1, stderr: '', status: @ok_status })
-      @backtrace.do_gdb( filename, executable, shell_result.dup, test_cases, context: :test )
+      @backtrace.do_gdb( filename, executable, shell_result.dup, test_cases, context: :test, test_name: test_name_of( filename ) )
 
       expect(@loginator).to receive(:log)
         .with(anything, Verbosity::ERRORS, LogLabels::WARNING).once
@@ -563,7 +567,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_multi, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_multi )
 
       expect(expected_output_lines).to include('test_lib.c:3:test_empty:PASS')
     end
@@ -582,7 +586,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_fail, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_fail )
 
       expect(expected_output_lines).to include('test_lib.c:8:test_bad:FAIL: Expected 1 Was 2')
     end
@@ -601,7 +605,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_ignore, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_ignore )
 
       expect(expected_output_lines).to include('test_lib.c:12:test_skip:IGNORE')
     end
@@ -625,7 +629,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_ignore, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_ignore )
 
       expect(expected_output_lines).to include('test_lib.c:12:test_skip:IGNORE: Not yet implemented')
       expect(expected_output_lines).to_not include(a_string_matching(/test_skip:FAIL/))
@@ -645,7 +649,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      result = @backtrace.do_simple( filename, executable, shell_result, test_cases, context: :test )
+      result = @backtrace.do_simple( filename, executable, shell_result, test_cases )
 
       expect(result[:exit_code]).to eq(1)
       expect(expected_output_lines.first).to include(':FAIL:')
@@ -666,7 +670,7 @@ describe GeneratorTestResultsBacktrace do
         .with(filename, shell_result, test_cases)
         .and_return(fallback_result)
 
-      result = @backtrace.do_simple( filename, executable, shell_result, test_cases, context: :test )
+      result = @backtrace.do_simple( filename, executable, shell_result, test_cases )
 
       expect(result).to eq(fallback_result)
     end
@@ -683,7 +687,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_crash, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_crash )
 
       crash_line = expected_output_lines.first
       expect(crash_line).to include(':FAIL: Test case crashed')
@@ -703,7 +707,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_simple( filename, executable, shell_result, test_cases_crash, context: :test )
+      @backtrace.do_simple( filename, executable, shell_result, test_cases_crash )
 
       crash_line = expected_output_lines.first
       expect(crash_line).to include(':FAIL: Test case crashed')
@@ -734,7 +738,7 @@ describe GeneratorTestResultsBacktrace do
     end
 
     def rerun(tool)
-      @backtrace.do_simple( filename, executable, { exit_code: 1, output: '', time: 0.0 }, test_cases, context: :test, tool: tool )
+      @backtrace.do_simple( filename, executable, { exit_code: 1, output: '', time: 0.0 }, test_cases, tool: tool )
     end
 
     it 'reruns through the dedicated backtrace tool when the fixture tool is the configured one' do
@@ -769,7 +773,7 @@ describe GeneratorTestResultsBacktrace do
     def crashed_lines(explain)
       lines = []
       allow(@generator_test_results).to receive(:regenerate_test_executable_stdout) { |**kwargs| lines = kwargs[:output]; 'regenerated' }
-      @backtrace.do_simple( filename, executable, { exit_code: 1, output: '', time: 0.0 }, test_cases, context: :test, explain: explain )
+      @backtrace.do_simple( filename, executable, { exit_code: 1, output: '', time: 0.0 }, test_cases, explain: explain )
       return lines
     end
 
@@ -923,7 +927,7 @@ describe GeneratorTestResultsBacktrace do
         'regenerated'
       end
 
-      @backtrace.do_gdb( filename_assert, executable, shell_result, test_cases_assert, context: :test )
+      @backtrace.do_gdb( filename_assert, executable, shell_result, test_cases_assert, context: :test, test_name: test_name_of( filename_assert ) )
 
       crash_line = expected_output_lines.first
       expect(crash_line).to include(">> Assertion '0' failed")

data/spec/units/generators/generator_test_results_spec.rb

@@ -12,7 +12,7 @@ require 'fileutils'
 require 'ceedling/generators/generator_test_results_sanity_checker'
 require 'ceedling/generators/generator_test_results'
 require 'ceedling/yaml_wrapper'
-require 'ceedling/file_wrapper'
+require 'ceedling/filesystem/file_wrapper'
 require 'ceedling/constants'
 require 'ceedling/config/configurator'
 

data/spec/units/handoff_spec.rb

@@ -0,0 +1,205 @@
+# =========================================================================
+#   Ceedling - Test-Centered Build System for C
+#   ThrowTheSwitch.org
+#   Copyright (c) 2010-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+#   SPDX-License-Identifier: MIT
+# =========================================================================
+
+require 'spec_helper'
+require 'tmpdir'
+require 'fileutils'
+require 'rbconfig'
+require 'ceedling/handoff'
+require 'ceedling/constants'
+require 'app_cfg'
+
+describe Handoff do
+  def installation_with_version(root, version)
+    FileUtils.mkdir_p( File.join( root, 'lib' ) )
+    File.write( File.join( root, 'lib', 'version.rb' ), "module Ceedling; module Version; TAG = '#{version}'; end; end\n" )
+    return Installation.new( root )
+  end
+
+  describe '.take_markers' do
+    it 'removes both markers from the environment and returns them' do
+      env = {'CEEDLING_HANDOFF_LAUNCHER' => '/gem', 'CEEDLING_HANDOFF_TARGET' => '/app', 'OTHER' => 'x'}
+
+      expect(described_class.take_markers( env )).to eq( {launcher: '/gem', target: '/app'} )
+      expect(env).to eq( {'OTHER' => 'x'} )
+    end
+
+    it 'returns nil when this process was not handed off' do
+      expect(described_class.take_markers( {} )).to be_nil
+    end
+  end
+
+  describe '.received?' do
+    it 'is true when the markers name this installation as the target' do
+      Dir.mktmpdir do |root|
+        expect(described_class.received?( {launcher: '/gem', target: root + '/'}, own: Installation.new( root ) )).to be( true )
+      end
+    end
+
+    # GH #1365: markers an older target leaks to a nested launcher name someone else
+    it 'is false when the markers name another installation' do
+      Dir.mktmpdir do |root|
+        expect(described_class.received?( {launcher: '/gem', target: '/elsewhere'}, own: Installation.new( root ) )).to be( false )
+      end
+    end
+
+    it 'is false without markers' do
+      expect(described_class.received?( nil, own: Installation.new( '/gem' ) )).to be( false )
+    end
+  end
+
+  describe 'messages' do
+    it 'names both installations and their versions when handing off' do
+      Dir.mktmpdir do |dir|
+        launcher = installation_with_version( File.join( dir, 'gem' ), '1.2.2' )
+        target   = installation_with_version( File.join( dir, 'app' ), '1.2.0' )
+
+        expect(described_class.handing_off_message( launcher: launcher, target: target )).to eq(
+          "Ceedling launcher 1.2.2 at #{launcher.root}/ is handing off to Ceedling 1.2.0 at #{target.root}/, which runs in its own process."
+        )
+      end
+    end
+
+    it 'names the launcher a handed-off process came from' do
+      Dir.mktmpdir do |dir|
+        own = installation_with_version( File.join( dir, 'app' ), '1.2.2' )
+        launcher = installation_with_version( File.join( dir, 'gem' ), '1.2.3' )
+
+        expect(described_class.received_message( {launcher: launcher.root, target: own.root}, own: own )).to eq(
+          "Ceedling 1.2.2 at #{own.root}/ is now running, launched from Ceedling 1.2.3 at #{launcher.root}/."
+        )
+      end
+    end
+  end
+
+  # GH #1365: a launcher before 1.2.2 always loads the application into its own process
+  describe '.complete_in_process' do
+    before(:each) do
+      # This repository's launcher stands in for an older one: its CeedlingAppConfig is
+      # defined beneath this repository's bin/, so any other application root is foreign
+      @app_cfg = CeedlingAppConfig.new
+      @launcher = Installation.new( @app_cfg[:launcher_root_path] )
+      @loginator = double('loginator').as_null_object
+      @system_wrapper = double('system_wrapper', get_cmdline: ['test:all', '-v', 'obnoxious'])
+      @handoff_objects = {loginator: @loginator, system_wrapper: @system_wrapper}
+      allow(described_class).to receive(:exec)
+    end
+
+    def complete(app_root, env: {})
+      described_class.complete_in_process( app_root: app_root, app_cfg: @app_cfg, handoff_objects: @handoff_objects, env: env )
+    end
+
+    it 'restarts a foreign launcher\'s application in its own process, with the original command line' do
+      Dir.mktmpdir do |root|
+        app = Installation.new( root )
+
+        expect(@loginator).to receive(:log).with(
+          "#{@launcher.describe( 'Ceedling launcher' )} loaded #{app.describe} into its own process. " +
+          "Restarting in #{app.name}'s own process. Upgrade Ceedling and review your installations to avoid this.",
+          Verbosity::COMPLAIN
+        ).ordered
+        expect(described_class).to receive(:exec).with(
+          target: app, launcher: @launcher, argv: ['test:all', '-v', 'obnoxious'], loginator: @loginator
+        ).ordered
+
+        complete( root )
+      end
+    end
+
+    it 'does nothing for the launcher\'s own application' do
+      complete( @launcher.root )
+
+      expect(described_class).to_not have_received(:exec)
+      expect(@loginator).to_not have_received(:log)
+    end
+
+    def expect_fallback(app)
+      expect(@loginator).to receive(:log).with(
+        "#{@launcher.describe( 'Ceedling launcher' )} loaded #{app.describe} into its own process. " +
+        "Continuing in the launcher's process, which can fail or misbehave. Upgrade Ceedling, or run this " +
+        "installation's own launcher directly with `ruby #{app.bin_path}`. A project created with `--local` has a " +
+        "launch script at its root that does this: run `./ceedling` from the project root (`.\\ceedling.cmd` on Windows).",
+        Verbosity::COMPLAIN
+      )
+    end
+
+    it 'warns and continues when the launcher kept no command line to restart with' do
+      Dir.mktmpdir do |root|
+        @handoff_objects[:system_wrapper] = double('old_system_wrapper')
+        expect_fallback( Installation.new( root ) )
+
+        complete( root )
+
+        expect(described_class).to_not have_received(:exec)
+      end
+    end
+
+    # A hand-off already happened in this chain; restarting again could cycle
+    it 'warns and continues when a launcher handed off to this process' do
+      Dir.mktmpdir do |root|
+        @app_cfg.set_handoff( {launcher: '/gem', target: @launcher.root} )
+        expect_fallback( Installation.new( root ) )
+
+        complete( root )
+
+        expect(described_class).to_not have_received(:exec)
+      end
+    end
+
+    it 'warns and continues when hand-off markers are still in the environment' do
+      Dir.mktmpdir do |root|
+        expect_fallback( Installation.new( root ) )
+
+        complete( root, env: {'CEEDLING_HANDOFF_TARGET' => '/somewhere'} )
+
+        expect(described_class).to_not have_received(:exec)
+      end
+    end
+
+    it 'names the launcher relative to the working directory when it lies beneath it' do
+      Dir.mktmpdir do |root|
+        Dir.chdir( root ) do
+          app = Installation.new( File.join( Dir.pwd, 'vendor', 'ceedling' ) )
+          @handoff_objects[:system_wrapper] = double('old_system_wrapper')
+
+          expect(@loginator).to receive(:log).with( /directly with `ruby vendor\/ceedling\/bin\/ceedling`/, Verbosity::COMPLAIN )
+
+          complete( app.root )
+        end
+      end
+    end
+  end
+
+  describe '.exec' do
+    before(:each) do
+      @loginator = double('loginator')
+      allow(@loginator).to receive(:wrapup)
+      allow(described_class).to receive(:replace_process)
+    end
+
+    it 'replaces this process with the target\'s own launcher, given the original command line and both markers' do
+      launcher = Installation.new( '/gem' )
+      target   = Installation.new( '/app' )
+
+      described_class.exec( target: target, launcher: launcher, argv: ['test:all', '--mixin', '=:a: b c'], loginator: @loginator )
+
+      expect(described_class).to have_received(:replace_process).with(
+        {'CEEDLING_HANDOFF_LAUNCHER' => launcher.root, 'CEEDLING_HANDOFF_TARGET' => target.root},
+        RbConfig.ruby, target.bin_path, 'test:all', '--mixin', '=:a: b c'
+      )
+    end
+
+    it 'drains logging and flushes the standard streams before the process is replaced' do
+      expect(@loginator).to receive(:wrapup).ordered
+      expect($stdout).to receive(:flush).ordered
+      expect($stderr).to receive(:flush).ordered
+      expect(described_class).to receive(:replace_process).ordered
+
+      described_class.exec( target: Installation.new( '/app' ), launcher: Installation.new( '/gem' ), argv: [], loginator: @loginator )
+    end
+  end
+end

data/spec/units/includes/include_factory_spec.rb

@@ -18,15 +18,15 @@ describe IncludeFactory do
   end
 
   describe '#user_include_from_filepath' do
-    it 'strips a flat test\'s own mock subdirectory down to the bare mock filename' do
-      include_obj = @factory.user_include_from_filepath( 'build/test/mocks/TestFoo/MockBar.h', test: 'TestFoo' )
+    it 'strips a test\'s own mock subdirectory down to the bare mock filename' do
+      include_obj = @factory.user_include_from_filepath( 'build/test/mocks/test/TestFoo/MockBar.h', test: 'test/TestFoo' )
       expect( include_obj.filename ).to eq( 'MockBar.h' )
       expect( include_obj.filepath ).to eq( 'MockBar.h' )
     end
 
     it 'strips a nested test\'s own multi-segment mock subdirectory down to the bare mock filename' do
       include_obj = @factory.user_include_from_filepath(
-        'build/test/mocks/adc/TestAdcConductor/MockAdcHardware.h', test: 'adc/TestAdcConductor'
+        'build/test/mocks/test/adc/TestAdcConductor/MockAdcHardware.h', test: 'test/adc/TestAdcConductor'
       )
       expect( include_obj.filename ).to eq( 'MockAdcHardware.h' )
       expect( include_obj.filepath ).to eq( 'MockAdcHardware.h' )

data/spec/units/includes/include_pathinator_spec.rb

@@ -20,6 +20,7 @@ describe IncludePathinator do
     @file_wrapper = double( "FileWrapper" )
 
     allow(@configurator).to receive(:extension_header).and_return( FilenameExtension.new('.h') )
+    allow(@configurator).to receive(:project_build_root).and_return( 'build' )
 
     @pathinator = described_class.new(
       {
@@ -63,6 +64,34 @@ describe IncludePathinator do
 
       expect(@pathinator.ordered_header_files(['inc', 'inc'])).to eq( ['inc/foo.h'] )
     end
+
+    # A test's search paths are listed several times a test, and nothing in a build writes
+    # into the project's own directories
+    it 'lists a directory outside the build root once' do
+      expect(@file_wrapper).to receive(:directory_listing).with(['inc/*.h']).once.and_return( ['inc/foo.h'] )
+
+      2.times { expect(@pathinator.ordered_header_files(['inc'])).to eq( ['inc/foo.h'] ) }
+    end
+
+    it 'lists a directory under the build root on every call, so headers the build writes appear' do
+      expect(@file_wrapper).to receive(:directory_listing).with(['build/test/mocks/*.h']).twice.and_return(
+        ['build/test/mocks/a.h'],
+        ['build/test/mocks/a.h', 'build/test/mocks/b.h']
+      )
+      expect(ProjectPaths).to receive(:contains?).once.and_call_original
+
+      expect(@pathinator.ordered_header_files(['build/test/mocks'])).to eq( ['build/test/mocks/a.h'] )
+      expect(@pathinator.ordered_header_files(['build/test/mocks'])).to eq( ['build/test/mocks/a.h', 'build/test/mocks/b.h'] )
+    end
+
+    it 'lists every directory again after the listings are forgotten' do
+      expect(@file_wrapper).to receive(:directory_listing).with(['inc/*.h']).twice.and_return( ['inc/foo.h'], ['inc/foo.h', 'inc/new.h'] )
+
+      @pathinator.ordered_header_files(['inc'])
+      @pathinator.forget_header_listings
+
+      expect(@pathinator.ordered_header_files(['inc'])).to eq( ['inc/foo.h', 'inc/new.h'] )
+    end
   end
 
   # Distinct from ordered_header_files: this returns the whole project collection, since a
@@ -266,4 +295,21 @@ describe IncludePathinator do
       expect(@pathinator.collect_test_include_paths).to eq(['has_headers'])
     end
   end
+
+  # A search path spelled with `./` or absolutely names the same place (the path handling
+  # audit around GH #1370)
+  describe 'G23: #prioritized_header_files with other spellings of a search path' do
+    before(:each) do
+      allow(@configurator).to receive(:collection_all_headers)
+        .and_return(Rake::FileList.new(['vendor/config.h', 'local/config.h']))
+    end
+
+    it 'ranks a `./`-spelled search path as the plain one' do
+      expect( @pathinator.prioritized_header_files(['./local', 'vendor']) ).to eq(['local/config.h', 'vendor/config.h'])
+    end
+
+    it 'ranks an absolute search path as the relative one' do
+      expect( @pathinator.prioritized_header_files([File.join( Dir.pwd, 'local' ), 'vendor']) ).to eq(['local/config.h', 'vendor/config.h'])
+    end
+  end
 end