ceedling 1.2.0 → 1.2.2

data/spec/units/{file_finder_helper_spec.rb → filesystem/file_finder_helper_spec.rb}

@@ -6,7 +6,7 @@
 # =========================================================================
 
 require 'spec_helper'
-require 'ceedling/file_finder_helper'
+require 'ceedling/filesystem/file_finder_helper'
 require 'ceedling/constants'
 require 'ceedling/loginator'
 
@@ -124,6 +124,22 @@ describe FileFinderHelper do
       @ff_helper.resolve_file_in_collection('c.cpp', FILE_LIST, :ignore)
     end
 
+    # Every test that names an ambiguous file looks it up, and each lookup makes the same choice
+    it 'logs a given choice once, however many lookups make it' do
+      expect(@loginator).to receive(:log).once
+
+      3.times { @ff_helper.resolve_file_in_collection('c.cpp', FILE_LIST, :ignore) }
+    end
+
+    it 'logs each different choice' do
+      expect(@loginator).to receive(:log).twice
+
+      2.times do
+        @ff_helper.resolve_file_in_collection('c.cpp', FILE_LIST, :ignore)
+        @ff_helper.resolve_file_in_collection('c.hpp', FILE_LIST, :ignore)
+      end
+    end
+
     it 'logs nothing when a bare basename resolves uniquely' do
       expect(@loginator).to_not receive(:log)
       @ff_helper.resolve_file_in_collection('a.c', FILE_LIST, :ignore)
@@ -154,4 +170,33 @@ describe FileFinderHelper do
       end
     end
   end
+  # A module generator path hint is matched to the configured path it resembles most
+  describe '#find_best_path_in_collection' do
+    PATHS = ['src', 'src/lab', 'src/lab/x', 'test/lab'].freeze
+
+    it 'gives a path the collection holds itself' do
+      expect(@ff_helper.find_best_path_in_collection( 'src/lab/x', PATHS, :error, 'module' )).to eq( 'src/lab/x' )
+    end
+
+    it 'prefers the first path ending as the hint does over one merely holding its segments' do
+      expect(@ff_helper.find_best_path_in_collection( 'lab', PATHS, :error, 'module' )).to eq( 'src/lab' )
+      expect(@ff_helper.find_best_path_in_collection( 'test/lab', ['src/lab', 'test/lab/x', 'test/lab'], :error, 'module' )).to eq( 'test/lab' )
+    end
+
+    it 'raises for a hint matching nothing when told to' do
+      expect { @ff_helper.find_best_path_in_collection( 'nowhere', PATHS, :error, 'module' ) }
+        .to raise_error( CeedlingException, 'Found no path `nowhere` in module search paths.' )
+    end
+
+    it 'warns of a hint matching nothing, or keeps quiet, and gives the first path' do
+      expect(@ff_helper.find_best_path_in_collection( 'nowhere', PATHS, :warn, 'module' )).to eq( 'src' )
+      expect(@loginator).to have_received(:log).with( 'Found no path `nowhere` in module search paths.', Verbosity::COMPLAIN )
+
+      expect(@ff_helper.find_best_path_in_collection( 'nowhere', PATHS, :ignore, 'module' )).to eq( 'src' )
+    end
+
+    it 'raises without a collection' do
+      expect { @ff_helper.find_best_path_in_collection( 'lab', nil, :error, 'module' ) }.to raise_error( /No path list provided for module search/ )
+    end
+  end
 end

data/spec/units/{file_finder_spec.rb → filesystem/file_finder_spec.rb}

@@ -6,8 +6,9 @@
 # =========================================================================
 
 require 'spec_helper'
-require 'ceedling/file_finder'
-require 'ceedling/file_finder_helper'
+require 'tmpdir'
+require 'ceedling/filesystem/file_finder'
+require 'ceedling/filesystem/file_finder_helper'
 require 'ceedling/filename_extension'
 require 'ceedling/exceptions'
 require 'ceedling/constants'
@@ -124,6 +125,7 @@ describe FileFinder do
       allow(@configurator).to receive(:paths_test).and_return( [] )
       allow(@configurator).to receive(:paths_support).and_return( [] )
       allow(@configurator).to receive(:paths_include).and_return( ['src'] )
+      allow(@configurator).to receive(:collection_mirror_roots_headers).and_return( ['src'] )
     end
 
     it 'resolves a mock header and its own mirrored subdirectory below the configured root that contains it' do
@@ -145,6 +147,26 @@ describe FileFinder do
       expect(bare_subdir).to eq(pathed_subdir)
     end
 
+    # GH #1370: a `..` root "contained" a header far above it, so its mock left the build directory
+    it 'places a mock of a header far above a `..` root flat, below the root that truly holds it' do
+      allow(@configurator).to receive(:collection_all_headers).and_return( ['../../../opt/sdk/inc/sdk.h'] )
+      allow(@configurator).to receive(:paths_include).and_return( ['../**', File.expand_path( '../../../opt/sdk/inc' )] )
+      allow(@configurator).to receive(:collection_mirror_roots_headers).and_return( ['..', '../../../opt/sdk/inc'] )
+
+      _source, subdir = @file_finder.resolve_mock('Mocksdk.h')
+      expect(subdir).to eq('')
+    end
+
+    # GH #1370 audit (G4): a glob in the middle of a root names one root per directory
+    it 'places a mock below the directory a glob-middle root names, not below the glob\'s base' do
+      allow(@configurator).to receive(:collection_all_headers).and_return( ['components/foo/include/foo.h'] )
+      allow(@configurator).to receive(:paths_include).and_return( ['components/*/include'] )
+      allow(@configurator).to receive(:collection_mirror_roots_headers).and_return( ['components/foo/include'] )
+
+      _source, subdir = @file_finder.resolve_mock('Mockfoo.h')
+      expect(subdir).to eq('')
+    end
+
     it 'still raises on a bogus (not-found) mock reference, exactly as find_header_input_for_mock does' do
       expect { @file_finder.resolve_mock('nonexistent/dir/Mockfoo.h') }.to raise_error(CeedlingException)
     end
@@ -234,18 +256,16 @@ describe FileFinder do
       expect(@file_finder.find_test_file_from_name('unit/test_foo')).to eq('unit/test_foo.c')
     end
 
-    it 'raises a clear CeedlingException naming .. as unsupported in a CLI task name, rather than a generic not-found' do
-      # A CLI task name has no file of its own to anchor a .. against -- unlike an
-      # #include or TEST_SOURCE_FILE() entry, which are always scoped to the test file
-      # that wrote them. Today's generic "Found no file" message happens to also
-      # contain the query text, so asserting on the query alone would pass for the
-      # wrong reason -- the message must specifically call out .. as the problem.
-      expect { @file_finder.find_test_file_from_name('../unit/test_foo') }.to raise_error(CeedlingException) do |error|
-        expect(error.message).to include('../unit/test_foo')
-        expect(error.message).not_to match(/Found no file/)
-        expect(error.message).to match(/\.\./)
-        expect(error.message).to match(/context/i)
-      end
+    # GH #1370 audit (G9): a task name is relative to the working directory, as every
+    # collected path is, so a leading `..` names a test outside the project
+    it 'resolves a name climbing out of the project, against the working directory' do
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['../tests/test_x.c', 'unit/test_foo.c'] )
+
+      expect(@file_finder.find_test_file_from_name('../tests/test_x')).to eq('../tests/test_x.c')
+    end
+
+    it 'resolves a name written with `./`' do
+      expect(@file_finder.find_test_file_from_name('./unit/test_foo')).to eq('unit/test_foo.c')
     end
   end
 
@@ -272,6 +292,15 @@ describe FileFinder do
       allow(@configurator).to receive(:project_build_root).and_return('build')
       # No configured include root contains these queries, so each keeps its own path.
       allow(@configurator).to receive(:paths_include).and_return( ['include'] )
+      allow(@configurator).to receive(:collection_mirror_roots_include).and_return( ['include'] )
+
+      # A test is named by its path without its extension. Examples that look tests up by
+      # name give their own test collection.
+      allow(@configurator).to receive(:collection_all_tests).and_return( [] )
+      allow(@file_path_utils).to receive(:form_test_name) { |test| test.to_s.ext( '' ) }
+      allow(@file_path_utils).to receive(:form_test_runners_path) do |name, **|
+        File.dirname( name ) == '.' ? 'build/test/runners' : File.join( 'build/test/runners', File.dirname( name ) )
+      end
     end
 
     it 'never raises, rather than silently missing a build, when two release sources share a basename -- resolves to the first by project path order' do
@@ -311,18 +340,72 @@ describe FileFinder do
       )
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/test/out/unit/test_foo/test_foo.o', complain: :error, context: TEST_SYM
+        filepath: 'build/test/out/test/unit/test_foo/test_foo.o', complain: :error, context: TEST_SYM
       )
       expect(found).to eq('test/unit/test_foo.c')
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/test/out/integration/test_foo/test_foo.o', complain: :error, context: TEST_SYM
+        filepath: 'build/test/out/test/integration/test_foo/test_foo.o', complain: :error, context: TEST_SYM
       )
       expect(found).to eq('test/integration/test_foo.c')
     end
 
+    # GH #1364: a test's own source resolves exactly, though its name ends another's path
+    {
+      'flat and nested under one root'        => ['test/test_calc.c', 'test/unit/test_calc.c'],
+      'the same subdirectory under two roots' => ['test/unit/test_calc.c', 'extra/unit/test_calc.c'],
+      'the same layout under two roots'       => ['test/foo/test_x.c', 'extra/foo/test_x.c']
+    }.each do |layout, tests|
+      it "resolves each test's own source exactly with #{layout}" do
+        allow(@configurator).to receive(:collection_all_tests).and_return( tests )
+
+        tests.each do |test|
+          name   = test.ext( '' )
+          object = File.join( 'build/test/out', name, File.basename( name ) + '.o' )
+
+          expect(@file_finder.find_build_input_file( filepath: object, complain: :error, context: TEST_SYM, test: name )).to eq( test )
+          expect(@file_finder.find_build_input_file( filepath: object, complain: :error, context: TEST_SYM )).to eq( test )
+        end
+      end
+    end
+
+    it 'resolves the source of a test outside the project, whose name matches no path' do
+      allow(@file_path_utils).to receive(:form_test_name) { |test| test.to_s.ext( '' ).gsub( '..', '_up_' ) }
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['../shared/test/unit/test_s.c'] )
+
+      found = @file_finder.find_build_input_file(
+        filepath: 'build/test/out/_up_/shared/test/unit/test_s/test_s.o', complain: :error, context: TEST_SYM
+      )
+      expect(found).to eq('../shared/test/unit/test_s.c')
+    end
+
+    it 'resolves a test whose name ends another test\'s path' do
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test/unit/test_calc.c', 'other/test/unit/test_calc.c'] )
+
+      found = @file_finder.find_build_input_file(
+        filepath: 'build/test/out/test/unit/test_calc/test_calc.o', complain: :error, context: TEST_SYM
+      )
+      expect(found).to eq('test/unit/test_calc.c')
+    end
+
+    it 'resolves a header named like its test to the test itself' do
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test/test_calc.c', 'test/unit/test_calc.c'] )
+
+      found = @file_finder.find_build_input_file( filepath: 'test_calc.h', complain: :error, context: TEST_SYM, test: 'test/unit/test_calc' )
+      expect(found).to eq('test/unit/test_calc.c')
+    end
+
+    it 'names every test once, however many lookups follow' do
+      expect(@configurator).to receive(:collection_all_tests).once.and_return( ['test/test_calc.c', 'test/unit/test_calc.c'] )
+
+      2.times do
+        @file_finder.find_build_input_file( filepath: 'build/test/out/test/test_calc/test_calc.o', complain: :error, context: TEST_SYM )
+      end
+    end
+
     it 'resolves a test\'s own runner by its own runner subdirectory, without treating another same-named test\'s runner as ambiguous' do
       allow(@configurator).to receive(:project_test_runners_path).and_return('build/test/runners')
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['unit/test_foo.c', 'integration/test_foo.c'] )
 
       all_runners = {
         'build/test/runners/unit'        => ['build/test/runners/unit/test_foo_runner.c'],
@@ -346,6 +429,7 @@ describe FileFinder do
 
     it 'resolves a mock generated once per test, by the current test\'s own build directory, without treating that expected repetition as ambiguous' do
       allow(@configurator).to receive(:cmock_mock_path).and_return('build/test/mocks')
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['TestAdcModel.c', 'TestModel.c'] )
 
       all_mocks = {
         'build/test/mocks/TestAdcModel'  => ['build/test/mocks/TestAdcModel/MockTemperatureFilter.c'],
@@ -370,6 +454,47 @@ describe FileFinder do
       expect(found).to eq('build/test/mocks/TestModel/MockTemperatureFilter.c')
     end
 
+    # One test's name continues another's, so its mock directory sits inside the other's
+    it 'keeps a test whose directory nests inside another test\'s from sharing that test\'s mocks' do
+      allow(@configurator).to receive(:cmock_mock_path).and_return('build/test/mocks')
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test/test_foo.c', 'test/test_foo/test_bar.c'] )
+      mocks = ['build/test/mocks/test/test_foo/Mockwidget.c', 'build/test/mocks/test/test_foo/test_bar/Mockwidget.c']
+      allow(@file_wrapper).to receive(:directory_listing) do |glob|
+        root = glob.delete_suffix( '/**/*.c' )
+        mocks.select { |mock| mock.start_with?( root + '/' ) }
+      end
+
+      found = @file_finder.find_build_input_file( filepath: 'build/test/out/test/test_foo/Mockwidget.o', complain: :error, context: TEST_SYM )
+      expect(found).to eq('build/test/mocks/test/test_foo/Mockwidget.c')
+
+      found = @file_finder.find_build_input_file( filepath: 'build/test/out/test/test_foo/test_bar/Mockwidget.o', complain: :error, context: TEST_SYM )
+      expect(found).to eq('build/test/mocks/test/test_foo/test_bar/Mockwidget.c')
+    end
+
+    it 'keeps a test whose directory nests inside another test\'s from sharing that test\'s Partials' do
+      allow(@configurator).to receive(:project_test_partials_path).and_return('build/test/partials')
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test/test_foo.c', 'test/test_foo/test_bar.c'] )
+      partials = ['build/test/partials/test/test_foo/ceedling_partial_widget_impl.c', 'build/test/partials/test/test_foo/test_bar/ceedling_partial_widget_impl.c']
+      allow(@file_wrapper).to receive(:directory_listing) do |glob|
+        root = glob.delete_suffix( '/**/*.c' )
+        partials.select { |partial| partial.start_with?( root + '/' ) }
+      end
+
+      found = @file_finder.find_build_input_file( filepath: 'build/test/out/test/test_foo/ceedling_partial_widget_impl.o', complain: :error, context: TEST_SYM )
+      expect(found).to eq('build/test/partials/test/test_foo/ceedling_partial_widget_impl.c')
+    end
+
+    it 'lists a test\'s mocks with any bracket in its path escaped, so the listing is not a glob class' do
+      allow(@configurator).to receive(:cmock_mock_path).and_return('build/test/mocks')
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test[1]/test_foo.c'] )
+
+      expect(@file_wrapper).to receive(:directory_listing).with( 'build/test/mocks/test\[1\]/test_foo/**/*.c' )
+        .and_return( ['build/test/mocks/test[1]/test_foo/Mockwidget.c'] )
+
+      found = @file_finder.find_build_input_file( filepath: 'build/test/out/test[1]/test_foo/Mockwidget.o', complain: :error, context: TEST_SYM )
+      expect(found).to eq('build/test/mocks/test[1]/test_foo/Mockwidget.c')
+    end
+
     it 'still raises when the very same test mocks two different same-named headers from different directories' do
       allow(@configurator).to receive(:cmock_mock_path).and_return('build/test/mocks')
       allow(@file_wrapper).to receive(:directory_listing).and_return(
@@ -412,39 +537,80 @@ describe FileFinder do
       expect(found).to eq('build/test/mocks/TestModel/MockTemperatureFilter.c')
     end
 
-    it 'resolves a release object via its own mirrored subdirectory, even when another same-named source exists elsewhere' do
+    it 'resolves a release object to the source at its own path, even when another same-named source exists elsewhere' do
       allow(@configurator).to receive(:collection_release_build_input).and_return(
         ['drivers/foo/bar.c', 'drivers/baz/bar.c']
       )
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/release/out/foo/bar.o', complain: :error, context: RELEASE_SYM
+        filepath: 'build/release/out/drivers/foo/bar.o', complain: :error, context: RELEASE_SYM
       )
       expect(found).to eq('drivers/foo/bar.c')
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/release/out/baz/bar.o', complain: :error, context: RELEASE_SYM
+        filepath: 'build/release/out/drivers/baz/bar.o', complain: :error, context: RELEASE_SYM
       )
       expect(found).to eq('drivers/baz/bar.c')
     end
 
-    it 'resolves a module-under-test object via its own mirrored subdirectory, even when another same-named module exists elsewhere' do
+    it 'resolves a module-under-test object to the source at its own path, even when another same-named module exists elsewhere' do
       allow(@file_path_utils).to receive(:form_test_build_path).with('TestFoo', context: TEST_SYM).and_return('build/test/out/TestFoo')
       allow(@configurator).to receive(:collection_existing_test_build_input).and_return(
         ['drivers/foo/bar.c', 'drivers/baz/bar.c']
       )
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/test/out/TestFoo/foo/bar.o', complain: :error, context: TEST_SYM, test: 'TestFoo'
+        filepath: 'build/test/out/TestFoo/drivers/foo/bar.o', complain: :error, context: TEST_SYM, test: 'TestFoo'
       )
       expect(found).to eq('drivers/foo/bar.c')
 
       found = @file_finder.find_build_input_file(
-        filepath: 'build/test/out/TestFoo/baz/bar.o', complain: :error, context: TEST_SYM, test: 'TestFoo'
+        filepath: 'build/test/out/TestFoo/drivers/baz/bar.o', complain: :error, context: TEST_SYM, test: 'TestFoo'
       )
       expect(found).to eq('drivers/baz/bar.c')
     end
 
+    # A tail match of `src/util` takes whichever of these comes first
+    it 'resolves an object to exactly its own source, never one whose path merely ends the same way' do
+      allow(@configurator).to receive(:collection_release_build_input).and_return( ['lib/src/util.c', 'src/util.c'] )
+
+      found = @file_finder.find_build_input_file( filepath: 'build/release/out/src/util.o', complain: :error, context: RELEASE_SYM )
+      expect(found).to eq('src/util.c')
+    end
+
+    it 'resolves an object of a source above the project root' do
+      allow(@configurator).to receive(:collection_release_build_input).and_return( ['src/crc.c', '../shared/src/crc.c'] )
+
+      found = @file_finder.find_build_input_file( filepath: 'build/release/out/_up_/shared/src/crc.o', complain: :error, context: RELEASE_SYM )
+      expect(found).to eq('../shared/src/crc.c')
+    end
+
+    it 'resolves an object of a file in the running Ceedling installation, placed below `_ceedling_`' do
+      helper = File.join( BuildSubpath::INSTALLATION_ROOT, 'plugins/fff/src/fff_unity_helper.c' )
+      allow(@file_path_utils).to receive(:form_test_build_path).with( 'test/test_x', context: TEST_SYM ).and_return( 'build/test/out/test/test_x' )
+      allow(@configurator).to receive(:collection_existing_test_build_input).and_return( ['src/fff_unity_helper.c', helper] )
+
+      Dir.mktmpdir do |project|
+        Dir.chdir( project ) do
+          found = @file_finder.find_build_input_file(
+            filepath: 'build/test/out/test/test_x/_ceedling_/plugins/fff/src/fff_unity_helper.o', complain: :error, context: TEST_SYM, test: 'test/test_x'
+          )
+          expect(found).to eq( helper )
+        end
+      end
+    end
+
+    it 'recovers a nested test\'s identity from its object\'s path, rather than its parent test\'s' do
+      allow(@configurator).to receive(:collection_all_tests).and_return( ['test/test_foo.c', 'test/test_foo/test_bar.c'] )
+      allow(@file_path_utils).to receive(:form_test_build_path) { |name, **| File.join( 'build/test/out', name ) }
+      allow(@configurator).to receive(:collection_existing_test_build_input).and_return( ['src/util.c'] )
+
+      expect(@file_finder.find_build_input_file( filepath: 'build/test/out/test/test_foo/test_bar/test/test_foo/test_bar.o', complain: :error, context: TEST_SYM ))
+        .to eq('test/test_foo/test_bar.c')
+      expect(@file_finder.find_build_input_file( filepath: 'build/test/out/test/test_foo/test/test_foo.o', complain: :error, context: TEST_SYM ))
+        .to eq('test/test_foo.c')
+    end
+
     it 'still resolves a flat module-under-test object by basename when no test identity is given' do
       allow(@configurator).to receive(:collection_existing_test_build_input).and_return( ['drivers/bar.c'] )
 

data/spec/units/{file_path_collection_utils_spec.rb → filesystem/file_path_collection_utils_spec.rb}

@@ -7,7 +7,7 @@
 
 require 'rake'  # for FileList
 require 'spec_helper'
-require 'ceedling/file_path_collection_utils'
+require 'ceedling/filesystem/file_path_collection_utils'
 
 describe FilePathCollectionUtils do
 
@@ -143,6 +143,49 @@ describe FilePathCollectionUtils do
       expect( result ).to include( 'src' )
     end
 
+
+    # GH #1370 audit (G13): an exclusion dropped only the directory it named, keeping those below
+    it 'excludes every directory below a `-:` exclusion' do
+      kept, dropped, deep = File.expand_path( 'src/a' ), File.expand_path( 'src/exp' ), File.expand_path( 'src/exp/deep' )
+      allow( @file_wrapper ).to receive( :directory_listing ).with( 'src/**/**' ).and_return( [kept, dropped, deep] )
+      allow( @file_wrapper ).to receive( :directory_listing ).with( 'src/exp' ).and_return( [dropped] )
+      allow( @file_wrapper ).to receive( :directory? ).and_return( true )
+
+      expect( @fpcu.collect_paths( ['+:src/**', '-:src/exp'] ) ).to match_array( ['src', 'src/a'] )
+    end
+
+    # GH #1370 audit (G15): a root above the build root collected the build tree
+    it 'excludes every directory below an excluded path' do
+      src, build = File.expand_path( 'src' ), File.expand_path( 'build/test/mocks' )
+      allow( @file_wrapper ).to receive( :directory_listing ).with( './**/**' ).and_return( [src, build] )
+      allow( @file_wrapper ).to receive( :directory? ).and_return( true )
+
+      expect( @fpcu.collect_paths( ['./**'], exclude: ['build'] ) ).to_not include( 'build/test/mocks' )
+    end
+  end
+
+
+  # GH #1370 audit: the places build files mirror below, each spelled canonically
+  describe '#collect_mirror_roots' do
+    it 'roots a recursive entry at its base, and a plain entry at itself' do
+      expect( @fpcu.collect_mirror_roots( ['src/**', 'include', './lib/*'] ) ).to eq( ['src', 'include', 'lib'] )
+    end
+
+    it 'roots a glob within an entry at each directory it names' do
+      named = [File.expand_path( 'components/a/include' ), File.expand_path( 'components/b/include' )]
+      allow( @file_wrapper ).to receive( :directory_listing ).with( 'components/*/include' ).and_return( named )
+      allow( @file_wrapper ).to receive( :directory? ).and_return( true )
+
+      expect( @fpcu.collect_mirror_roots( ['components/*/include'] ) ).to eq( ['components/a/include', 'components/b/include'] )
+    end
+
+    it 'roots nothing at a `-:` exclusion, and keeps a literal bracket as part of a name' do
+      expect( @fpcu.collect_mirror_roots( ['+:src/**', '-:src/exp', 'src/[legacy]'] ) ).to eq( ['src', 'src/[legacy]'] )
+    end
+
+    it 'returns [] for nil input' do
+      expect( @fpcu.collect_mirror_roots( nil ) ).to eq( [] )
+    end
   end
 
 
@@ -229,3 +272,140 @@ describe FilePathCollectionUtils do
   end
 
 end
+
+# The path handling audit around GH #1370: one place collected under two spellings is still
+# one place, so an exclusion names it however it was reached
+describe FilePathCollectionUtils, 'on disk' do
+  require 'tmpdir'
+  require 'fileutils'
+  require 'ceedling/filesystem/file_wrapper'
+
+  POSIX_ONLY_COLLECTION = { unless: Gem.win_platform? }.freeze
+
+  around(:each) do |example|
+    Dir.mktmpdir do |dir|
+      @ws = File.realpath( dir )
+      FileUtils.mkdir_p( File.join( @ws, 'app/src/a' ) )
+      FileUtils.mkdir_p( File.join( @ws, 'vendor/ext' ) )
+      File.write( File.join( @ws, 'vendor/ext/foo.c' ), '' )
+      File.write( File.join( @ws, 'app/src/a/bar.c' ), '' )
+      Dir.chdir( File.join( @ws, 'app' ) ) { example.run }
+    end
+  end
+
+  before(:each) do
+    file_wrapper = FileWrapper.new( { loginator: double( 'loginator' ).as_null_object, verbosinator: double( 'verbosinator' ).as_null_object } )
+    @fpcu = described_class.new( { file_wrapper: file_wrapper } )
+  end
+
+  def link_ext
+    File.symlink( File.join( @ws, 'vendor/ext' ), File.join( @ws, 'app/src/ext' ) )
+  end
+
+  it 'leaves out a symlinked directory below a root its `-:` entry names', **POSIX_ONLY_COLLECTION do
+    link_ext
+
+    expect(@fpcu.collect_paths( ['+:src/**', '-:src/ext'] )).to eq( ['src', 'src/a'] )
+  end
+
+  it 'collects a symlinked directory once, however many entries reach it', **POSIX_ONLY_COLLECTION do
+    link_ext
+
+    expect(@fpcu.collect_paths( ['+:src/**', '+:src/ext'] ).count { |dir| dir.end_with?( 'ext' ) }).to eq( 1 )
+  end
+
+  # An #include or a test name spells a place below a root through the root as listed,
+  # as the compiler and the command line do
+  it 'spells a symlinked directory below an entry\'s base as it is listed', **POSIX_ONLY_COLLECTION do
+    link_ext
+
+    expect(@fpcu.collect_paths( ['+:src/**'] )).to include( 'src/ext' )
+    expect(@fpcu.revise_filelist( ['src/ext/foo.c'], ['+:src/a/*.c'] ).to_a).to eq( ['src/ext/foo.c', 'src/a/bar.c'] )
+  end
+
+  it 'spells an entry\'s symlinked base as it really is', **POSIX_ONLY_COLLECTION do
+    File.symlink( File.join( @ws, 'vendor' ), File.join( @ws, 'app/vend' ) )
+
+    expect(@fpcu.collect_paths( ['+:vend/**'] )).to eq( ['../vendor', '../vendor/ext'] )
+  end
+
+  it 'removes a file below a symlinked directory that a `-:` revision names', **POSIX_ONLY_COLLECTION do
+    link_ext
+
+    expect(@fpcu.revise_filelist( ['src/a/bar.c', 'src/ext/foo.c'], ['-:src/ext/foo.c'] ).to_a).to eq( ['src/a/bar.c'] )
+    expect(@fpcu.revise_filelist( ['src/ext/foo.c'], ['+:src/ext/foo.c'] ).to_a.size).to eq( 1 )
+  end
+
+  # macOS spells /tmp as /private/tmp, and a build root may be written through any symlink
+  it 'excludes a build root written through a symlink', **POSIX_ONLY_COLLECTION do
+    FileUtils.mkdir_p( 'build/test' )
+    File.symlink( File.join( @ws, 'app' ), File.join( @ws, 'link' ) )
+
+    expect(@fpcu.collect_paths( ['+:./**'], exclude: [File.join( @ws, 'link/build' )] )).to eq( ['.', 'src', 'src/a'] )
+  end
+
+  it 'keeps a directory an additive entry names below a `-:` entry, and leaves out one both name' do
+    FileUtils.mkdir_p( ['src/legacy/keep', 'src/legacy/other'] )
+
+    expect(@fpcu.collect_paths( ['+:src/**', '-:src/legacy', '+:src/legacy/keep'] )).to eq( ['src', 'src/a', 'src/legacy/keep'] )
+    expect(@fpcu.collect_paths( ['+:src/**', '+:src/legacy', '-:src/legacy'] )).to eq( ['src', 'src/a'] )
+  end
+
+  it 'leaves out the files a revision glob matches below an excluded root, but keeps those a revision based there names' do
+    FileUtils.mkdir_p( ['build/gen', 'build/test/mocks'] )
+    File.write( 'build/gen/table.c', '' )
+    File.write( 'build/test/mocks/mock_x.c', '' )
+
+    expect(@fpcu.revise_filelist( ['src/a/bar.c'], ['+:**/*.c'], exclude: ['build'] ).to_a).to eq( ['src/a/bar.c'] )
+    expect(@fpcu.revise_filelist( [], ['+:build/gen/table.c'], exclude: ['build'] ).to_a).to eq( ['build/gen/table.c'] )
+    expect(@fpcu.revise_filelist( [], ['+:build/**/*.c'], exclude: ['build'] ).to_a).to eq( ['build/gen/table.c', 'build/test/mocks/mock_x.c'] )
+  end
+
+  it 'adds no file below a reserved directory, however a revision names it' do
+    FileUtils.mkdir_p( ['build/gen', 'build/test/mocks'] )
+    File.write( 'build/gen/table.c', '' )
+    File.write( 'build/test/mocks/mock_x.c', '' )
+
+    expect(@fpcu.revise_filelist( [], ['+:build/**/*.c'], exclude: ['build'], reserved: ['build/test'] ).to_a).to eq( ['build/gen/table.c'] )
+    expect(@fpcu.revise_filelist( [], ['+:build/test/mocks/mock_x.c'], reserved: ['build/test'] ).to_a).to be_empty
+  end
+
+  it 'collects what an entry based below an excluded root names, less any reserved directory' do
+    FileUtils.mkdir_p( ['build/gen/sub', 'build/test/mocks'] )
+
+    expect(@fpcu.collect_paths( ['+:build/**'], exclude: ['build'], reserved: ['build/test'] )).to contain_exactly( 'build', 'build/gen', 'build/gen/sub' )
+    expect(@fpcu.collect_paths( ['+:build/test/mocks'], exclude: ['build'], reserved: ['build/test'] )).to be_empty
+    expect(@fpcu.collect_paths( ['+:./**'], exclude: ['build'], reserved: ['build/test'] )).to_not include( 'build/gen' )
+  end
+
+  # Only the entries that name a directory decide whether it is kept
+  it 'judges each directory by the entries that name it, not every entry\'s base' do
+    FileUtils.mkdir_p( ['src/legacy/x/inc', 'src/legacy/keep/sub'] )
+
+    expect(@fpcu.collect_paths( ['+:src/**', '+:src/legacy/*/inc', '-:src'] )).to eq( ['src/legacy/x/inc'] )
+    expect(@fpcu.collect_paths( ['+:src/**', '+:src/legacy/keep', '-:src/legacy'] )).to contain_exactly( 'src', 'src/a', 'src/legacy/keep' )
+  end
+
+  it 'leaves out many directories below a `-:` entry quickly' do
+    200.times { |index| FileUtils.mkdir_p( "vendor_tree/d#{index}/x" ) }
+    200.times { |index| FileUtils.mkdir_p( "src/m#{index}" ) }
+
+    started = Process.clock_gettime( Process::CLOCK_MONOTONIC )
+    result  = @fpcu.collect_paths( ['+:./**', '-:vendor_tree/**'] )
+
+    expect(result).to_not include( 'vendor_tree' )
+    expect(Process.clock_gettime( Process::CLOCK_MONOTONIC ) - started).to be < 2.0
+  end
+
+  describe '#collect_mirror_roots' do
+    it 'reads a literal bracket in an entry with a glob as part of a name (#104)' do
+      FileUtils.mkdir_p( 'lib[v2]/x/inc' )
+
+      expect(@fpcu.collect_mirror_roots( ['lib[v2]/*/inc'] )).to eq( ['lib[v2]/x/inc'] )
+    end
+
+    it 'roots a doubled recursive glob at its base' do
+      expect(@fpcu.collect_mirror_roots( ['src/**/**'] )).to eq( ['src'] )
+    end
+  end
+end