DEBUG REMOVE ME

Author: ianfixes

.travis.yml

@@ -20,13 +20,16 @@ matrix:
 #before_install: gem install bundler -v 1.15.4
 script:
    - g++ -v
-   - bundle install
-   - bundle exec rubocop --version
-   - bundle exec rubocop -D .
-   - bundle exec rspec --backtrace
+  #  - bundle install
+  #  - bundle exec rubocop --version
+  #  - bundle exec rubocop -D .
+  #  - bundle exec rspec --backtrace
    - cd SampleProjects/TestSomething
-   - bundle install
-   - bundle exec arduino_ci.rb
+  #  - bundle install
+  #  - bundle exec arduino_ci.rb
    - cd ../NetworkLib
+   - cd scripts
+   - bash -x ./install.sh
+   - cd ..
    - bundle install
    - bundle exec arduino_ci.rb

SampleProjects/NetworkLib/scripts/install.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# if we don't have an Ethernet library already (say, in new install or for an automated test),
+# then get the custom one we want to use for testing
+cd $(bundle exec arduino_library_location.rb)
+if [ ! -d ./Ethernet ] ; then
+  git clone https://github.com/Arduino-CI/Ethernet.git
+fi

appveyor.yml

@@ -19,12 +19,15 @@ before_test:
 test_script:
   # https://help.appveyor.com/discussions/problems/5170-progresspreference-not-works-always-shown-preparing-modules-for-first-use-in-stderr
   - ps: $ProgressPreference = "SilentlyContinue"
-  - bundle exec rubocop --version
-  - bundle exec rubocop -D .
-  - bundle exec rspec --backtrace
+  # - bundle exec rubocop --version
+  # - bundle exec rubocop -D .
+  # - bundle exec rspec --backtrace
   - cd SampleProjects\TestSomething
-  - bundle install
-  - bundle exec arduino_ci.rb
+  # - bundle install
+  # - bundle exec arduino_ci.rb
   - cd ../NetworkLib
+  - cd scripts
+  - install.sh
+  - cd ..
   - bundle install
   - bundle exec arduino_ci.rb

lib/arduino_ci/cpp_library.rb

@@ -290,7 +290,12 @@ def header_dirs
       unbundled = header_files.reject { |path| vendor_bundle?(path) }
       unexcluded = unbundled.reject { |path| in_exclude_dir?(path) }
       files = unexcluded.select { |path| HPP_EXTENSIONS.include?(path.extname.downcase) }
-      files.map(&:dirname).uniq
+      ret = files.map(&:dirname).uniq
+      puts "header_dirs for #{@base_dir} = #{ret}"
+      puts "from header_files: #{header_files}"
+      puts "all items in library dir: #{Dir.entries(@arduino_lib_dir)}"
+      puts "all files in dir: #{Dir.entries(@base_dir)}"
+      ret
     end
 
     # wrapper for the GCC command
@@ -328,6 +333,7 @@ def arduino_library_src_dirs(aux_libraries)
     # @return [Array<String>] The GCC command-line flags necessary to include those libraries
     def include_args(aux_libraries)
       all_aux_include_dirs = arduino_library_src_dirs(aux_libraries)
+      puts "all_aux_include_dirs from #{aux_libraries} = \n #{all_aux_include_dirs}"
       places = [ARDUINO_HEADER_DIR, UNITTEST_HEADER_DIR] + header_dirs + all_aux_include_dirs
       places.map { |d| "-I#{d}" }
     end
@@ -411,6 +417,8 @@ def build_for_test_with_configuration(test_file, aux_libraries, gcc_binary, ci_g
       # combine library.properties defs (if existing) with config file.
       # TODO: as much as I'd like to rely only on the properties file(s), I think that would prevent testing 1.0-spec libs
       full_aux_libraries = arduino_library_dependencies.nil? ? aux_libraries : aux_libaries + arduino_library_dependencies
+      puts "full_aux_libraries = #{full_aux_libraries}"
+      puts "after aux_libraries = #{aux_libraries}"
       arg_sets << test_args(full_aux_libraries, ci_gcc_config)
       arg_sets << cpp_files_libraries(full_aux_libraries).map(&:to_s)
       arg_sets << [test_file.to_s]