26 files changed, 33 insertions, 46 deletions
diff --git a/apps/px4/tests/Makefile b/apps/px4/tests/Makefile
deleted file mode 100644
index e27222b9d..000000000
--- a/apps/px4/tests/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-############################################################################
-#
-#   Copyright (C) 2012 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-#
-# Makefile to build assorted test cases
-#
-
-APPNAME		 = tests
-PRIORITY	 = SCHED_PRIORITY_DEFAULT
-STACKSIZE	 = 12000
-
-include $(APPDIR)/mk/app.mk
-
-MAXOPTIMIZATION	 = -Os
-\ No newline at end of file
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk
index 3f634d72c..e70079fa1 100644
--- a/makefiles/config_px4fmu_default.mk
+++ b/makefiles/config_px4fmu_default.mk
@@ -14,7 +14,12 @@ MODULES		+= drivers/px4fmu
 MODULES		+= drivers/boards/px4fmu
 MODULES		+= drivers/l3gd20
 MODULES		+= drivers/ardrone_interface
+
+#
+# System utilities
+#
 MODULES		+= systemcmds/eeprom
+MODULES		+= systemcmds/tests
 
 #
 # General system control
@@ -72,7 +77,6 @@ BUILTIN_COMMANDS := \
 	$(call _B, sensors,                SCHED_PRIORITY_MAX-5,      4096,  sensors_main               ) \
 	$(call _B, sercon,                 ,                          2048,  sercon_main                ) \
 	$(call _B, serdis,                 ,                          2048,  serdis_main                ) \
-	$(call _B, tests,                  ,                          12000, tests_main                 ) \
 	$(call _B, tone_alarm,             ,                          2048,  tone_alarm_main            ) \
 	$(call _B, top,                    SCHED_PRIORITY_DEFAULT-10, 3000,  top_main                   ) \
 	$(call _B, param,                  SCHED_PRIORITY_DEFAULT-10, 2048,  param_main                 ) \
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig
index 1e5d7d4e1..6e91f3d1a 100644
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@@ -127,7 +127,6 @@ CONFIGURED_APPS += drivers/mb12xx
 
 # Testing stuff
 CONFIGURED_APPS += px4/sensors_bringup
-CONFIGURED_APPS += px4/tests
 
 ifeq ($(CONFIG_CAN),y)
 #CONFIGURED_APPS += examples/can
diff --git a/apps/px4/tests/.context b/src/systemcmds/tests/.context
index e69de29bb..e69de29bb 100644
--- a/apps/px4/tests/.context
+++ b/src/systemcmds/tests/.context
diff --git a/src/systemcmds/tests/module.mk b/src/systemcmds/tests/module.mk
new file mode 100644
index 000000000..754d3a0da
--- /dev/null
+++ b/src/systemcmds/tests/module.mk
@@ -0,0 +1,28 @@
+#
+# Assorted tests and the like
+#
+
+MODULE_COMMAND		 = tests
+MODULE_STACKSIZE	 = 12000
+MAXOPTIMIZATION		 = -Os
+
+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_time.c \
+			   test_uart_baudchange.c \
+			   test_uart_console.c \
+			   test_uart_loopback.c \
+			   test_uart_send.c \
+			   tests_file.c \
+			   tests_main.c \
+			   tests_param.c
diff --git a/apps/px4/tests/test_adc.c b/src/systemcmds/tests/test_adc.c
index 030ac6e23..030ac6e23 100644
--- a/apps/px4/tests/test_adc.c
+++ b/src/systemcmds/tests/test_adc.c
diff --git a/apps/px4/tests/test_bson.c b/src/systemcmds/tests/test_bson.c
index 6130fe763..6130fe763 100644
--- a/apps/px4/tests/test_bson.c
+++ b/src/systemcmds/tests/test_bson.c
diff --git a/apps/px4/tests/test_float.c b/src/systemcmds/tests/test_float.c
index 4921c9bbb..4921c9bbb 100644
--- a/apps/px4/tests/test_float.c
+++ b/src/systemcmds/tests/test_float.c
diff --git a/apps/px4/tests/test_gpio.c b/src/systemcmds/tests/test_gpio.c
index ab536d956..ab536d956 100644
--- a/apps/px4/tests/test_gpio.c
+++ b/src/systemcmds/tests/test_gpio.c
diff --git a/apps/px4/tests/test_hott_telemetry.c b/src/systemcmds/tests/test_hott_telemetry.c
index 270dc3857..270dc3857 100644
--- a/apps/px4/tests/test_hott_telemetry.c
+++ b/src/systemcmds/tests/test_hott_telemetry.c
diff --git a/apps/px4/tests/test_hrt.c b/src/systemcmds/tests/test_hrt.c
index f21dd115b..f21dd115b 100644
--- a/apps/px4/tests/test_hrt.c
+++ b/src/systemcmds/tests/test_hrt.c
diff --git a/apps/px4/tests/test_int.c b/src/systemcmds/tests/test_int.c
index c59cee7b7..c59cee7b7 100644
--- a/apps/px4/tests/test_int.c
+++ b/src/systemcmds/tests/test_int.c
diff --git a/apps/px4/tests/test_jig_voltages.c b/src/systemcmds/tests/test_jig_voltages.c
index 10c93b264..10c93b264 100644
--- a/apps/px4/tests/test_jig_voltages.c
+++ b/src/systemcmds/tests/test_jig_voltages.c
diff --git a/apps/px4/tests/test_led.c b/src/systemcmds/tests/test_led.c
index 6e3efc668..6e3efc668 100644
--- a/apps/px4/tests/test_led.c
+++ b/src/systemcmds/tests/test_led.c
diff --git a/apps/px4/tests/test_sensors.c b/src/systemcmds/tests/test_sensors.c
index 14503276c..14503276c 100644
--- a/apps/px4/tests/test_sensors.c
+++ b/src/systemcmds/tests/test_sensors.c
diff --git a/apps/px4/tests/test_servo.c b/src/systemcmds/tests/test_servo.c
index f95760ca8..f95760ca8 100644
--- a/apps/px4/tests/test_servo.c
+++ b/src/systemcmds/tests/test_servo.c
diff --git a/apps/px4/tests/test_sleep.c b/src/systemcmds/tests/test_sleep.c
index ae682b542..ae682b542 100644
--- a/apps/px4/tests/test_sleep.c
+++ b/src/systemcmds/tests/test_sleep.c
diff --git a/apps/px4/tests/test_time.c b/src/systemcmds/tests/test_time.c
index 8a164f3fc..8a164f3fc 100644
--- a/apps/px4/tests/test_time.c
+++ b/src/systemcmds/tests/test_time.c
diff --git a/apps/px4/tests/test_uart_baudchange.c b/src/systemcmds/tests/test_uart_baudchange.c
index 609a65c62..609a65c62 100644
--- a/apps/px4/tests/test_uart_baudchange.c
+++ b/src/systemcmds/tests/test_uart_baudchange.c
diff --git a/apps/px4/tests/test_uart_console.c b/src/systemcmds/tests/test_uart_console.c
index f8582b52f..f8582b52f 100644
--- a/apps/px4/tests/test_uart_console.c
+++ b/src/systemcmds/tests/test_uart_console.c
diff --git a/apps/px4/tests/test_uart_loopback.c b/src/systemcmds/tests/test_uart_loopback.c
index 3be152004..3be152004 100644
--- a/apps/px4/tests/test_uart_loopback.c
+++ b/src/systemcmds/tests/test_uart_loopback.c
diff --git a/apps/px4/tests/test_uart_send.c b/src/systemcmds/tests/test_uart_send.c
index 7e1e8d307..7e1e8d307 100644
--- a/apps/px4/tests/test_uart_send.c
+++ b/src/systemcmds/tests/test_uart_send.c
diff --git a/apps/px4/tests/tests.h b/src/systemcmds/tests/tests.h
index c02ea6808..c02ea6808 100644
--- a/apps/px4/tests/tests.h
+++ b/src/systemcmds/tests/tests.h
diff --git a/apps/px4/tests/tests_file.c b/src/systemcmds/tests/tests_file.c
index 6f75b9812..6f75b9812 100644
--- a/apps/px4/tests/tests_file.c
+++ b/src/systemcmds/tests/tests_file.c
diff --git a/apps/px4/tests/tests_main.c b/src/systemcmds/tests/tests_main.c
index 9f8c5c9ea..9f8c5c9ea 100644
--- a/apps/px4/tests/tests_main.c
+++ b/src/systemcmds/tests/tests_main.c
diff --git a/apps/px4/tests/tests_param.c b/src/systemcmds/tests/tests_param.c
index 13f17bc43..13f17bc43 100644
--- a/apps/px4/tests/tests_param.c
+++ b/src/systemcmds/tests/tests_param.c