[tests] Fixes and improves the release tests.

roboterclubaachen · Jun 28, 2017 · f2ac1a0 · f2ac1a0
2 parents 611e3af + 008bfda
commit f2ac1a0
Show file tree

Hide file tree

Showing 30 changed files with 120 additions and 24 deletions.
diff --git a/src/SConstruct b/src/SConstruct
@@ -118,6 +118,12 @@ else:
 								template = template)
 
 	sources = [runner] + files.sources
+
+	# build xpcc_build_info.hpp file
+	env.BuildInfoHeader()
+
+	# build xpcc_git_info.hpp file
+	env.GitInfoHeader()
 
 	# build the program
 	program = env.Program(target = 'executable',

diff --git a/src/xpcc/architecture/platform/board/al_avreb_can/al_avreb_can.hpp b/src/xpcc/architecture/platform/board/al_avreb_can/al_avreb_can.hpp
@@ -31,6 +31,8 @@ using Led3 = xpcc::GpioInverted<GpioOutputF3>;
 using Button = xpcc::GpioUnused;
 using Leds = xpcc::SoftwareGpioPort< Led3, Led2, Led1, Led0 >;
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< Uart1, xpcc::IOBuffer::BlockIfFull >;
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/al_avreb_can/al_avreb_can_serial.cpp b/src/xpcc/architecture/platform/board/al_avreb_can/al_avreb_can_serial.cpp
@@ -7,5 +7,5 @@
 
 #include "al_avreb_can.hpp"
 
-xpcc::IODeviceWrapper< Uart1, xpcc::IOBuffer::BlockIfFull > serialDevice;
+Board::LoggerDevice serialDevice;
 xpcc::IOStream serialStream(serialDevice);
diff --git a/src/xpcc/architecture/platform/board/arduino_uno/arduino_uno.hpp b/src/xpcc/architecture/platform/board/arduino_uno/arduino_uno.hpp
@@ -53,6 +53,8 @@ using LedD13 = D13;
 
 using Leds = xpcc::SoftwareGpioPort< LedD13 >;
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< Uart0, xpcc::IOBuffer::BlockIfFull >;
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/arduino_uno/arduino_uno_serial.cpp b/src/xpcc/architecture/platform/board/arduino_uno/arduino_uno_serial.cpp
@@ -7,7 +7,7 @@
 #include "arduino_uno.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Uart0, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::IOStream serialStream(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f031k6/nucleo_f031k6.cpp b/src/xpcc/architecture/platform/board/nucleo_f031k6/nucleo_f031k6.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f031k6.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f031k6/nucleo_f031k6.hpp b/src/xpcc/architecture/platform/board/nucleo_f031k6/nucleo_f031k6.hpp
@@ -106,6 +106,9 @@ using Tx = GpioOutputA2;
 using Uart = Usart1;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_f103rb/nucleo_f103rb.cpp b/src/xpcc/architecture/platform/board/nucleo_f103rb/nucleo_f103rb.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f103rb.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f103rb/nucleo_f103rb.hpp b/src/xpcc/architecture/platform/board/nucleo_f103rb/nucleo_f103rb.hpp
@@ -102,6 +102,9 @@ using Tx = GpioOutputA2;
 using Uart = Usart2;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_f303k8/nucleo_f303k8.cpp b/src/xpcc/architecture/platform/board/nucleo_f303k8/nucleo_f303k8.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f303k8.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f303k8/nucleo_f303k8.hpp b/src/xpcc/architecture/platform/board/nucleo_f303k8/nucleo_f303k8.hpp
@@ -117,6 +117,9 @@ using Tx = GpioOutputA2;
 using Uart = Usart2;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_f401re/nucleo_f401re.cpp b/src/xpcc/architecture/platform/board/nucleo_f401re/nucleo_f401re.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f401re.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f401re/nucleo_f401re.hpp b/src/xpcc/architecture/platform/board/nucleo_f401re/nucleo_f401re.hpp
@@ -103,6 +103,9 @@ using Tx = GpioOutputA2;
 using Uart = Usart2;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_f411re/nucleo_f411re.cpp b/src/xpcc/architecture/platform/board/nucleo_f411re/nucleo_f411re.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f411re.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f411re/nucleo_f411re.hpp b/src/xpcc/architecture/platform/board/nucleo_f411re/nucleo_f411re.hpp
@@ -103,6 +103,9 @@ using Tx = GpioOutputA2;
 using Uart = Usart2;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_f429zi/nucleo_f429zi.cpp b/src/xpcc/architecture/platform/board/nucleo_f429zi/nucleo_f429zi.cpp
@@ -8,7 +8,7 @@
 #include "nucleo_f429zi.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_f429zi/nucleo_f429zi.hpp b/src/xpcc/architecture/platform/board/nucleo_f429zi/nucleo_f429zi.hpp
@@ -198,6 +198,9 @@ using Rx = GpioInputD9;
 using Uart = Usart3;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 
 inline void
 initialize()

diff --git a/src/xpcc/architecture/platform/board/nucleo_l476rg/nucleo_l476rg.cpp b/src/xpcc/architecture/platform/board/nucleo_l476rg/nucleo_l476rg.cpp
@@ -7,7 +7,7 @@
 #include "nucleo_l476rg.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/nucleo_l476rg/nucleo_l476rg.hpp b/src/xpcc/architecture/platform/board/nucleo_l476rg/nucleo_l476rg.hpp
@@ -87,6 +87,9 @@ using Rx = GpioInputA3;
 using Uart = Usart2;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 inline void
 initialize()
 {

diff --git a/src/xpcc/architecture/platform/board/stm32f469_discovery/stm32f469_discovery.cpp b/src/xpcc/architecture/platform/board/stm32f469_discovery/stm32f469_discovery.cpp
@@ -17,7 +17,7 @@
 #include <xpcc/utils/bit_constants.hpp>
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/stm32f469_discovery/stm32f469_discovery.hpp b/src/xpcc/architecture/platform/board/stm32f469_discovery/stm32f469_discovery.hpp
@@ -159,6 +159,9 @@ using Rx = GpioInputB11;		// STLK_TX [STLINK V2-1_U2_TX]: USART3_RX
 using Uart = Usart3;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 inline void
 initializeTouchscreen()
 {

diff --git a/src/xpcc/architecture/platform/board/stm32f746g_discovery/stm32f746g_discovery.cpp b/src/xpcc/architecture/platform/board/stm32f746g_discovery/stm32f746g_discovery.cpp
@@ -16,7 +16,7 @@
 #include "stm32f746g_discovery.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/stm32f746g_discovery/stm32f746g_discovery.hpp b/src/xpcc/architecture/platform/board/stm32f746g_discovery/stm32f746g_discovery.hpp
@@ -115,6 +115,9 @@ using Rx = GpioInputB7;
 using Uart = Usart1;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 inline void
 initialize()
 {

diff --git a/src/xpcc/architecture/platform/board/stm32f769i_discovery/stm32f769i_discovery.cpp b/src/xpcc/architecture/platform/board/stm32f769i_discovery/stm32f769i_discovery.cpp
@@ -16,7 +16,7 @@
 #include "stm32f769i_discovery.hpp"
 
 // Create an IODeviceWrapper around the Uart Peripheral we want to use
-xpcc::IODeviceWrapper< Board::stlink::Uart, xpcc::IOBuffer::BlockIfFull > loggerDevice;
+Board::LoggerDevice loggerDevice;
 
 // Set all four logger streams to use the UART
 xpcc::log::Logger xpcc::log::debug(loggerDevice);

diff --git a/src/xpcc/architecture/platform/board/stm32f769i_discovery/stm32f769i_discovery.hpp b/src/xpcc/architecture/platform/board/stm32f769i_discovery/stm32f769i_discovery.hpp
@@ -118,6 +118,9 @@ using Rx = GpioInputA10;
 using Uart = Usart1;
 }
 
+// Create an IODeviceWrapper around the Uart Peripheral we want to use
+using LoggerDevice = xpcc::IODeviceWrapper< stlink::Uart, xpcc::IOBuffer::BlockIfFull >;
+
 // Onboard MicroSD card slot
 namespace usd
 {

diff --git a/src/xpcc/driver/pressure/bmp085_data_impl_double.hpp b/src/xpcc/driver/pressure/bmp085_data_impl_double.hpp
@@ -34,13 +34,13 @@ DataDouble::calculateCalibratedTemperature()
 		double c4 = ::pow(10, -3) * ::pow(2, -15) * calibration.ac4;
 		double b1 = ::pow(160, 2) * ::pow(2, -30) * calibration.b1;
 
-		c5 = (::pow(2, -15) / 160) * calibration.ac5;
+		c5 = (::pow(2, -15) / 160.0) * double(calibration.ac5);
 		c6 = calibration.ac6;
-		mc = (::pow(2, 11) / ::pow(160, 2)) * calibration.mc;
+		mc = (::pow(2, 11) / ::pow(160, 2)) * double(calibration.mc);
 		md = calibration.md / 160.0;
 		x0 = calibration.ac1;
-		x1 = double(160.0) * ::pow(2, -13) * calibration.ac2;
-		x2 = ::pow(160, 2) * ::pow(2, -25) * calibration.b2;
+		x1 = double(160.0) * ::pow(2, -13) * double(calibration.ac2);
+		x2 = ::pow(160, 2) * ::pow(2, -25) * double(calibration.b2);
 		y00 = c4 * ::pow(2, 15);
 		y11 = c4 * c3;
 		y2 = c4 * b1;
@@ -93,8 +93,8 @@ DataDouble::calculateCalibratedPressure()
 	calculateCalibratedTemperature();
 
 	double s = calibratedTemperatureDouble - double(25.0);
-	double x = (x2 * pow(s, 2)) + (x1 * s) + x0;
-	double y = (y2 * pow(s, 2)) + (y11 * s) + y00;
+	double x = (x2 * s * s) + ( x1 * s) + x0;
+	double y = (y2 * s * s) + (y11 * s) + y00;
 	double z = (pu - x) / y;
 
 	XPCC_LOG_DEBUG.printf("s = %9.5f\n", s);

diff --git a/src/xpcc/driver/pressure/test/bmp085_test.cpp b/src/xpcc/driver/pressure/test/bmp085_test.cpp
@@ -1,6 +1,8 @@
 #include <xpcc/driver/pressure/bmp085.hpp>
 #include <xpcc/debug/logger/logger.hpp>
 
+#include <algorithm> // for std::max
+
 #include "bmp085_test.hpp"
 
 #undef  XPCC_LOG_LEVEL
@@ -133,10 +135,11 @@ Bmp085Test::testConversion()
 
 		// Check pressure conversion at 10 different temperatures
 		uint16_t adc_temp_span = adc_temp_max[jj] - adc_temp_min[jj];
+		uint16_t adc_temp_inc  = std::max(adc_temp_span / 10U, 1U);
 
 		for (uint16_t adc_temp = adc_temp_min[jj]; 
 			 adc_temp < adc_temp_max[jj]; 
-			 adc_temp += adc_temp_span/10)
+			 adc_temp += adc_temp_inc)
 		{
 			data.raw[0] = adc_temp >> 8;
 			data.raw[1] = adc_temp & 0xff;
@@ -152,9 +155,10 @@ Bmp085Test::testConversion()
 			XPCC_LOG_DEBUG.printf("adc_temp = %04x, T = %f\n", adc_temp, temp);
 
 			uint16_t adc_press_span = adc_press_max[jj] - adc_press_min[jj];
+			uint16_t adc_press_inc  = std::max(adc_press_span / 10U, 1U);
 			for (uint16_t adc_press = adc_press_min[jj];
 				 adc_press < adc_press_max[jj];
-				 adc_press += adc_press_span/10)
+				 adc_press += adc_press_inc)
 			{
 				data.raw[2] = adc_press >> 8;
 				data.raw[3] = adc_press & 0xff;
@@ -189,7 +193,7 @@ Bmp085Test::testConversion()
 		XPCC_LOG_DEBUG.printf(" max = %d\n", max_error);
 		XPCC_LOG_DEBUG.printf(" sum = %d\n", total_error);
 
-		TEST_ASSERT_TRUE(total_error <= 1541);
-		TEST_ASSERT_TRUE(max_error <= 71);
+		TEST_ASSERT_EQUALS_RANGE(total_error, 0, 1541);
+		TEST_ASSERT_EQUALS_RANGE(max_error,   0,   71);
 	}
 }
diff --git a/src/xpcc/io/test/io_stream_test.cpp b/src/xpcc/io/test/io_stream_test.cpp
@@ -477,6 +477,8 @@ IoStreamTest::testPrintf1()
 void
 IoStreamTest::testPrintf2()
 {
+#ifdef XPCC__OS_HOSTED
+	// Only run on hosted because glibc needs so many flash and RAM may crash.
 	// Compare xpcc's formatter with glibc's formatter
 
 	float ff_testvector[] = {
@@ -515,6 +517,7 @@ IoStreamTest::testPrintf2()
 			}
 		}
 	}
+#endif
 }
 
 int myFunc1(void) { return -1; };

diff --git a/src/xpcc/processing/resumable/test/resumable_test.cpp b/src/xpcc/processing/resumable/test/resumable_test.cpp
@@ -901,7 +901,7 @@ ResumableTest::testReturnVoidClass()
 	auto result = thread.resumable();
 	TEST_ASSERT_EQUALS(result.getState(), xpcc::rf::Stop);
 	TEST_ASSERT_EQUALS(result.getResult(), xpcc::rf::Stop);
-	TEST_ASSERT_TRUE(sizeof(result) == 1);
+	TEST_ASSERT_EQUALS(sizeof(result), sizeof(uint_fast8_t));
 
 	// this now returns the state
 	auto result2 = RF_CALL_BLOCKING(thread.resumable());