From: Jim Morris <morris@wolfman.com>
Date: Sun, 13 Sep 2015 06:07:12 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/development/test-framework' into development... 
X-Git-Url: http://git.hcoop.net/clinton/Smoothieware.git/commitdiff_plain/a3cb0c4cacfa85ea0cbe17a192f4819e38d65537

Merge remote-tracking branch 'upstream/development/test-framework' into development/test-framework

Conflicts:
	Rakefile
	src/testframework/Test_kernel.cpp
---

a3cb0c4cacfa85ea0cbe17a192f4819e38d65537
diff --cc Rakefile
index 410941fb,060147d1..5213d6b0
--- a/Rakefile
+++ b/Rakefile
@@@ -119,10 -119,8 +119,11 @@@ if TESTIN
    TESTMODULES= %w(tools/temperatureswitch) unless defined? EXCLUDE_MODULES
    puts "Modules under test: #{TESTMODULES}"
    excludes << %w(Kernel.cpp main.cpp) # we replace these with mock versions in testframework
 -  testmodules= FileList['src/testframework/*.{c,cpp}', 'src/testframework/easyunit/*.{c,cpp}', 'src/modules/communication/SerialConsole.cpp', 'src/modules/communication/utils/Gcode.cpp'].include(TESTMODULES.collect { |e| "src/modules/#{e}/**/*.{c,cpp}"}).include(TESTMODULES.collect { |e| "src/testframework/unittests/#{e}/*.{c,cpp}"})
 -  SRC = FileList['src/libs/**/*.{c,cpp}'].exclude(/#{excludes.join('|')}/) + testmodules
++
 +  frameworkfiles= FileList['src/testframework/*.{c,cpp}', 'src/testframework/easyunit/*.{c,cpp}']
 +  extrafiles= FileList['src/modules/communication/SerialConsole.cpp', 'src/modules/communication/utils/Gcode.cpp', 'src/modules/robot/Conveyor.cpp', 'src/modules/robot/Block.cpp']
 +  testmodules= FileList['src/libs/**/*.{c,cpp}'].include(TESTMODULES.collect { |e| "src/modules/#{e}/**/*.{c,cpp}"}).include(TESTMODULES.collect { |e| "src/testframework/unittests/#{e}/*.{c,cpp}"}).exclude(/#{excludes.join('|')}/)
 +  SRC =  frameworkfiles + extrafiles + testmodules
  else
    excludes << %w(testframework)
    SRC = FileList['src/**/*.{c,cpp}'].exclude(/#{excludes.join('|')}/)
diff --cc src/testframework/Test_kernel.cpp
index ab36bdc4,f1289670..f9ee86c0
--- a/src/testframework/Test_kernel.cpp
+++ b/src/testframework/Test_kernel.cpp
@@@ -64,11 -57,6 +57,11 @@@ Kernel::Kernel()
  
      this->current_path   = "/";
  
 +    this->slow_ticker = new SlowTicker();
 +
-     // dummies (woul dbe noce to refactor to not have to create a conveyor)
++    // dummies (would be nice to refactor to not have to create a conveyor)
 +    this->conveyor= new Conveyor();
 +
      // Configure UART depending on MRI config
      // Match up the SerialConsole to MRI UART. This makes it easy to use only one UART for both debug and actual commands.
      NVIC_SetPriorityGrouping(0);