Track command and output of GCC

Author: ianfixes

exe/arduino_ci_remote.rb

@@ -9,7 +9,7 @@
 # terminate after printing any debug info.  TODO: capture debug info
 def terminate
   puts "Failures: #{@failure_count}"
-  unless failure_count.zero?
+  unless @failure_count.zero?
     puts "Last message: #{@arduino_cmd.last_msg}"
     puts "========== Stdout:"
     puts @arduino_cmd.last_out
@@ -96,10 +96,8 @@ def assure(message, &block)
     attempt("Verifying #{example_name}") do
       ret = @arduino_cmd.verify_sketch(example_path)
       unless ret
-        puts "Last message: #{@arduino_cmd.last_msg}"
-        puts "========== Stdout:"
-        puts @arduino_cmd.last_out
-        puts "========== Stderr:"
+        puts
+        puts "Last command: #{@arduino_cmd.last_msg}"
         puts @arduino_cmd.last_err
       end
       ret
@@ -112,6 +110,22 @@ def assure(message, &block)
   assure("Switching to board for #{p} (#{board})") { @arduino_cmd.use_board(board) }
   cpp_library.test_files.each do |unittest_path|
     unittest_name = File.basename(unittest_path)
-    attempt("Unit testing #{unittest_name}") { cpp_library.test(unittest_path) }
+    attempt("Unit testing #{unittest_name}") do
+      exe = build_for_test_with_configuration(
+        unittest_path,
+        config.aux_libraries_for_unittest,
+        config.gcc_config(p)
+      )
+      unless exe
+        puts
+        puts "Last command: #{cpp_library.last_cmd}"
+        puts cpp_library.last_out
+        puts cpp_library.last_err
+        next false
+      end
+      cpp_library.run_test_file(exe)
+    end
   end
 end
+
+terminate

lib/arduino_ci/ci_config.rb

@@ -174,38 +174,12 @@ def aux_libraries_for_unittest
       @unittest_info[:libraries]
     end
 
-    def features(platform_name)
+    def gcc_config(platform_name)
       plat = @platform_info[platform_name]
-      return [] if plat.nil?
-      return [] if plat[:gcc].nil?
-      return [] if plat[:gcc][:features].nil?
-      plat[:gcc][:features]
+      return {} if plat.nil?
+      return {} if plat[:gcc].nil?
+      plat[:gcc]
     end
-
-    def warnings(platform_name)
-      plat = @platform_info[platform_name]
-      return [] if plat.nil?
-      return [] if plat[:gcc].nil?
-      return [] if plat[:gcc][:warnings].nil?
-      plat[:gcc][:warnings]
-    end
-
-    def flags(platform_name)
-      plat = @platform_info[platform_name]
-      return [] if plat.nil?
-      return [] if plat[:gcc].nil?
-      return [] if plat[:gcc][:flags].nil?
-      plat[:gcc][:flags]
-    end
-
-    def defines(platform_name)
-      plat = @platform_info[platform_name]
-      return [] if plat.nil?
-      return [] if plat[:gcc].nil?
-      return [] if plat[:gcc][:flags].nil?
-      plat[:gcc][:flags]
-    end
-
   end
 
 end

lib/arduino_ci/cpp_library.rb

@@ -14,9 +14,16 @@ class CppLibrary
     attr_reader :base_dir
     attr_reader :artifacts
 
+    attr_reader :last_err
+    attr_reader :last_out
+    attr_reader :last_cmd
+
     def initialize(base_dir)
       @base_dir = base_dir
       @artifacts = []
+      @last_err = ""
+      @last_out = ""
+      @last_msg = ""
     end
 
     def cpp_files_in(some_dir)
@@ -56,9 +63,23 @@ def header_dirs
 
     # wrapper for the GCC command
     def run_gcc(*args, **kwargs)
-      # TODO: detect env!!
+      pipe_out, pipe_out_wr = IO.pipe
+      pipe_err, pipe_err_wr = IO.pipe
       full_args = ["g++"] + args
-      Host.run(*full_args, **kwargs)
+      @last_cmd = " $ #{full_args.join(' ')}"
+      our_kwargs = { out: pipe_out_wr, err: pipe_err_wr }
+      eventual_kwargs = our_kwargs.merge(kwargs)
+      success = Host.run(*full_args, **eventual_kwargs)
+
+      pipe_out_wr.close
+      pipe_err_wr.close
+      str_out = pipe_out.read
+      str_err = pipe_err.read
+      pipe_out.close
+      pipe_err.close
+      @last_err = str_err
+      @last_out = str_out
+      success
     end
 
     # GCC command line arguments for including aux libraries
@@ -104,12 +125,22 @@ def test_args(aux_libraries, ci_gcc_config)
 
     # run a test of the given unit test file
     def test_with_configuration(test_file, aux_libraries, ci_gcc_config)
+      executable = build_for_test_with_configuration(test_file, aux_libraries, ci_gcc_config)
+      run_test_file(executable)
+    end
+
+    # run a test of the given unit test file
+    def build_for_test_with_configuration(test_file, aux_libraries, ci_gcc_config)
       base = File.basename(test_file)
       executable = File.expand_path("unittest_#{base}.bin")
       File.delete(executable) if File.exist?(executable)
       args = ["-o", executable] + test_args(aux_libraries, ci_gcc_config) + [test_file]
-      return false unless run_gcc(*args)
+      return nil unless run_gcc(*args)
       artifacts << executable
+      executable
+    end
+
+    def run_test_file(executable)
       Host.run(executable)
     end