From fecdfe5fbce6c64fdd7a024945eaab82058970ef Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 24 Nov 2018 11:59:24 -0500
Subject: [PATCH] move posix/tests/hrt_test to systemcmds/tests/hrt_test

---
 src/systemcmds/tests/CMakeLists.txt                       | 2 ++
 .../posix => systemcmds}/tests/hrt_test/CMakeLists.txt    | 4 ++--
 .../posix => systemcmds}/tests/hrt_test/hrt_test.cpp      | 8 +++++---
 .../posix => systemcmds}/tests/hrt_test/hrt_test.h        | 0
 .../posix => systemcmds}/tests/hrt_test/hrt_test_main.cpp | 7 +++++--
 .../tests/hrt_test/hrt_test_start.cpp}                    | 8 +++++---
 6 files changed, 19 insertions(+), 10 deletions(-)
 rename src/{platforms/posix => systemcmds}/tests/hrt_test/CMakeLists.txt (96%)
 rename src/{platforms/posix => systemcmds}/tests/hrt_test/hrt_test.cpp (99%)
 rename src/{platforms/posix => systemcmds}/tests/hrt_test/hrt_test.h (100%)
 rename src/{platforms/posix => systemcmds}/tests/hrt_test/hrt_test_main.cpp (99%)
 rename src/{platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp => systemcmds/tests/hrt_test/hrt_test_start.cpp} (99%)

diff --git a/src/systemcmds/tests/CMakeLists.txt b/src/systemcmds/tests/CMakeLists.txt
index b054092cab..2228020bf3 100644
--- a/src/systemcmds/tests/CMakeLists.txt
+++ b/src/systemcmds/tests/CMakeLists.txt
@@ -103,3 +103,5 @@ px4_add_module(
 		pwm_limit
 		version
 	)
+
+add_subdirectory(hrt_test)
diff --git a/src/platforms/posix/tests/hrt_test/CMakeLists.txt b/src/systemcmds/tests/hrt_test/CMakeLists.txt
similarity index 96%
rename from src/platforms/posix/tests/hrt_test/CMakeLists.txt
rename to src/systemcmds/tests/hrt_test/CMakeLists.txt
index 931260bf21..4c87188b02 100644
--- a/src/platforms/posix/tests/hrt_test/CMakeLists.txt
+++ b/src/systemcmds/tests/hrt_test/CMakeLists.txt
@@ -31,11 +31,11 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE platforms__posix__tests__hrt_test
+	MODULE systemcmds__tests__hrt_test
 	MAIN hrt_test
 	SRCS
 		hrt_test_main.cpp
-		hrt_test_start_posix.cpp
+		hrt_test_start.cpp
 		hrt_test.cpp
 	DEPENDS
 	)
diff --git a/src/platforms/posix/tests/hrt_test/hrt_test.cpp b/src/systemcmds/tests/hrt_test/hrt_test.cpp
similarity index 99%
rename from src/platforms/posix/tests/hrt_test/hrt_test.cpp
rename to src/systemcmds/tests/hrt_test/hrt_test.cpp
index 1bd5db1e68..2c220af492 100644
--- a/src/platforms/posix/tests/hrt_test/hrt_test.cpp
+++ b/src/systemcmds/tests/hrt_test/hrt_test.cpp
@@ -39,10 +39,12 @@
  * @author Mark Charlebois <charlebm@gmail.com>
  */
 
-#include "px4_log.h"
-#include <px4_time.h>
-#include <drivers/drv_hrt.h>
 #include "hrt_test.h"
+
+#include <drivers/drv_hrt.h>
+#include <px4_log.h>
+#include <px4_time.h>
+
 #include <unistd.h>
 #include <stdio.h>
 #include <cstring>
diff --git a/src/platforms/posix/tests/hrt_test/hrt_test.h b/src/systemcmds/tests/hrt_test/hrt_test.h
similarity index 100%
rename from src/platforms/posix/tests/hrt_test/hrt_test.h
rename to src/systemcmds/tests/hrt_test/hrt_test.h
diff --git a/src/platforms/posix/tests/hrt_test/hrt_test_main.cpp b/src/systemcmds/tests/hrt_test/hrt_test_main.cpp
similarity index 99%
rename from src/platforms/posix/tests/hrt_test/hrt_test_main.cpp
rename to src/systemcmds/tests/hrt_test/hrt_test_main.cpp
index 9a01690e38..d90cffba40 100644
--- a/src/platforms/posix/tests/hrt_test/hrt_test_main.cpp
+++ b/src/systemcmds/tests/hrt_test/hrt_test_main.cpp
@@ -37,10 +37,13 @@
  *
  * @author Mark Charlebois <charlebm@gmail.com>
  */
+
+#include "hrt_test.h"
+
+#include <stdio.h>
+
 #include <px4_middleware.h>
 #include <px4_app.h>
-#include "hrt_test.h"
-#include <stdio.h>
 
 int PX4_MAIN(int argc, char **argv)
 {
diff --git a/src/platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp b/src/systemcmds/tests/hrt_test/hrt_test_start.cpp
similarity index 99%
rename from src/platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp
rename to src/systemcmds/tests/hrt_test/hrt_test_start.cpp
index 0519367169..fe50e1c79c 100644
--- a/src/platforms/posix/tests/hrt_test/hrt_test_start_posix.cpp
+++ b/src/systemcmds/tests/hrt_test/hrt_test_start.cpp
@@ -37,13 +37,15 @@
  * @author Mark Charlebois <mcharleb@gmail.com>
  */
 #include "hrt_test.h"
-#include <px4_log.h>
-#include <px4_app.h>
-#include <px4_tasks.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <sched.h>
 
+#include <px4_log.h>
+#include <px4_app.h>
+#include <px4_tasks.h>
+
 static int daemon_task;             /* Handle of deamon task / thread */
 
 extern "C" __EXPORT int hrt_test_main(int argc, char *argv[]);