Merged master into driver_framework

src/systemcmds/tests/CMakeLists.txt

@@ -58,7 +58,6 @@ set(srcs
 	test_rc.c
 	test_conv.cpp
 	test_mount.c
-	test_eigen.cpp
 	)
 
 if(${OS} STREQUAL "nuttx")
@@ -73,6 +72,7 @@ px4_add_module(
 	STACK 60000
 	COMPILE_FLAGS
 		-Wframe-larger-than=6000
+		-Wno-float-equal
 		-O0
 	SRCS ${srcs}
 	DEPENDS

src/systemcmds/tests/module.mk

@@ -1,51 +0,0 @@
-#
-# Assorted tests and the like
-#
-
-MODULE_COMMAND		 = tests
-MODULE_STACKSIZE	 = 60000
-MAXOPTIMIZATION		 = -O0
-
-SRCS			 = test_adc.c \
-			   test_bson.c \
-			   test_float.c \
-			   test_gpio.c \
-			   test_hott_telemetry.c \
-			   test_hrt.c \
-			   test_int.c \
-			   test_jig_voltages.c \
-			   test_led.c \
-			   test_sensors.c \
-			   test_servo.c \
-			   test_sleep.c \
-			   test_uart_baudchange.c \
-			   test_uart_console.c \
-			   test_uart_loopback.c \
-			   test_uart_send.c \
-			   test_mixer.cpp \
-			   test_mathlib.cpp \
-			   test_file.c \
-			   test_file2.c \
-			   tests_main.c \
-			   test_param.c \
-			   test_ppm_loopback.c \
-			   test_rc.c \
-			   test_conv.cpp \
-			   test_mount.c \
-			   test_eigen.cpp
-
-ifeq ($(PX4_TARGET_OS), nuttx)
-SRCS			+= test_time.c
-
-EXTRACXXFLAGS = -Wframe-larger-than=6000
-else
-EXTRACXXFLAGS =
-endif
-
-EXTRACXXFLAGS += -Wno-float-equal
-
-# Flag is only valid for GCC, not clang
-ifneq ($(USE_GCC), 0)
-EXTRACXXFLAGS += -Wno-double-promotion -Wno-error=logical-op
-endif
-

src/systemcmds/tests/test_hrt.c

@@ -37,7 +37,7 @@
  ****************************************************************************/
 
 #include <px4_config.h>
-
+#include <px4_posix.h>
 #include <sys/types.h>
 #include <sys/time.h>
 

src/systemcmds/tests/test_time.c

@@ -37,7 +37,8 @@
  ****************************************************************************/
 
 #include <px4_config.h>
-
+#include <px4_defines.h>
+#include <px4_posix.h>
 #include <sys/types.h>
 
 #include <stdio.h>

src/systemcmds/tests/tests_main.c

@@ -50,11 +50,11 @@
 #include <errno.h>
 
 #include <arch/board/board.h>
-
-//#include <nuttx/spi.h>
-
 #include <systemlib/perf_counter.h>
 
+// Not using Eigen at the moment
+#define TESTS_EIGEN_DISABLE
+
 #include "tests.h"
 
 /****************************************************************************
@@ -113,7 +113,9 @@ const struct {
 #ifndef TESTS_MATHLIB_DISABLE
 	{"mathlib",		test_mathlib,	0},
 #endif
+#ifndef TESTS_EIGEN_DISABLE
 	{"eigen",		test_eigen,	OPT_NOJIGTEST},
+#endif
 	{"help",		test_help,	OPT_NOALLTEST | OPT_NOHELP | OPT_NOJIGTEST},
 	{NULL,			NULL, 		0}
 };