Fix breaking tests

Author: ianfixes

exe/arduino_ci_remote.rb

@@ -88,16 +88,22 @@ def assured_platform(purpose, name, config)
   platform_definition
 end
 
+# Return true if the file (or one of the dirs containing it) is hidden
+def file_is_hidden_somewhere?(path)
+  path.ascend do |part|
+    return true if part.basename.to_s.start_with? "."
+  end
+  false
+end
+
 # print out some files
 def display_files(pathname)
   # `find` doesn't follow symlinks, so we should instead
   realpath = pathname.symlink? ? pathname.readlink : pathname
 
   # suppress directories and dotfile-based things
   all_files = realpath.find.select(&:file?)
-  non_hidden = all_files.reject do |path|
-    path.ascend.any? { |part| part.basename.to_s.start_with? "." }
-  end
+  non_hidden = all_files.reject { |path| file_is_hidden_somewhere?(path) }
 
   # print files with an indent
   margin = " " * FIND_FILES_INDENT

lib/arduino_ci/cpp_library.rb

@@ -50,14 +50,34 @@ def initialize(base_dir, arduino_lib_dir)
     #
     # This assumes the vendor bundle will be at `vendor/bundle` and not some other location
     # @param path [Pathname] The path to check
-    # @return [Array<Pathname>] The paths of the found files
+    # @return [bool]
     def vendor_bundle?(path)
       # TODO: look for Gemfile, look for .bundle/config and get BUNDLE_PATH from there?
       base = @base_dir + "vendor"
       return false unless base.exist?
 
-      real = base.realpath
-      path.ascend.any? { |part| part == base || part == real }
+      vendor_bundle_aliases = [base, base.realpath]
+
+      # we could do this but some rubies don't return an enumerator for ascend
+      # path.ascend.any? { |part| vendor_bundle_aliases.include?(part) }
+      path.ascend do |part|
+        return true if vendor_bundle_aliases.include?(part)
+      end
+      false
+    end
+
+    # Guess whether a file is part of the tests/ dir (indicating library compilation should ignore it).
+    #
+    # @param path [Pathname] The path to check
+    # @return [bool]
+    def in_tests_dir?(path)
+      tests_dir_aliases = [tests_dir, tests_dir.realpath]
+      # we could do this but some rubies don't return an enumerator for ascend
+      # path.ascend.any? { |part| tests_dir_aliases.include?(part) }
+      path.ascend do |part|
+        return true if tests_dir_aliases.include?(part)
+      end
+      false
     end
 
     # Check whether libasan (and by extension -fsanitizer=address) is supported
@@ -94,11 +114,7 @@ def cpp_files_in(some_dir)
     # CPP files that are part of the project library under test
     # @return [Array<Pathname>]
     def cpp_files
-      tests_dir_aliases = [tests_dir, tests_dir.realpath]
-      cpp_files_in(@base_dir).reject do |p|
-        # ignore anything in the vendor bundle or tests dir
-        vendor_bundle?(p) || (p.ascend.any? { |part| tests_dir_aliases.include?(part) })
-      end
+      cpp_files_in(@base_dir).reject { |p| vendor_bundle?(p) || in_tests_dir?(p) }
     end
 
     # CPP files that are part of the arduino mock library we're providing

spec/ci_config_spec.rb

@@ -9,7 +9,7 @@
       uno = default_config.platform_definition("uno")
       expect(uno.class).to eq(Hash)
       expect(uno[:board]).to eq("arduino:avr:uno")
-      expect(uno[:package]).to be nil
+      expect(uno[:package]).to eq("arduino:avr")
       expect(uno[:gcc].class).to eq(Hash)
 
       due = default_config.platform_definition("due")
@@ -47,7 +47,7 @@
       uno = combined_config.platform_definition("uno")
       expect(uno.class).to eq(Hash)
       expect(uno[:board]).to eq("arduino:avr:uno")
-      expect(uno[:package]).to be nil
+      expect(uno[:package]).to eq("arduino:avr")
       expect(uno[:gcc].class).to eq(Hash)
 
       zero = combined_config.platform_definition("zero")
@@ -87,7 +87,7 @@
       uno = combined_config.platform_definition("uno")
       expect(uno.class).to eq(Hash)
       expect(uno[:board]).to eq("arduino:avr:uno")
-      expect(uno[:package]).to be nil
+      expect(uno[:package]).to eq("arduino:avr")
       expect(uno[:gcc].class).to eq(Hash)
 
       zero = combined_config.platform_definition("zero")