Merge remote-tracking branch 'upstream/development/test-framework' in…

…to development/test-framework Conflicts: Rakefile src/testframework/Test_kernel.cpp
Smoothieware · Sep 13, 2015 · a3cb0c4 · a3cb0c4
2 parents 2097978 + ad433ba
commit a3cb0c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Rakefile b/Rakefile
@@ -119,6 +119,7 @@ if TESTING
   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
+
   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('|')}/)

diff --git a/src/testframework/Test_kernel.cpp b/src/testframework/Test_kernel.cpp
@@ -40,13 +40,6 @@ This is aprt of the Smoothie test framework, it generates a Mockable Kernl so ke
 
 Kernel* Kernel::instance;
 
-
-// define some dummies here to satisfy linker
-// Conveyor::Conveyor(){ /*dummy*/ }
-// void Conveyor::wait_for_empty_queue(){ /*dummy*/ }
-//template class HeapRing<Block>;
-
-
 // The kernel is the central point in Smoothie : it stores modules, and handles event calls
 Kernel::Kernel(){
     instance= this; // setup the Singleton instance of the kernel
@@ -66,7 +59,7 @@ Kernel::Kernel(){
 
     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