From 5671df0af4e258ef0a83377cdbd50e59734aa00b Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Sun, 13 Oct 2013 11:44:42 +0200
Subject: [PATCH] Improved mixer tests

---
 Tools/tests-host/Makefile       | 7 +++++--
 Tools/tests-host/mixer_test.cpp | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Tools/tests-host/Makefile b/Tools/tests-host/Makefile
index c603b2aa2a..97410ff47c 100644
--- a/Tools/tests-host/Makefile
+++ b/Tools/tests-host/Makefile
@@ -10,14 +10,14 @@ LIBS=-lm
 #_DEPS = test.h
 #DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
 
-_OBJ = mixer_test.o test_mixer.o mixer_simple.o mixer_multirotor.o mixer.o mixer_group.o
+_OBJ = mixer_test.o test_mixer.o mixer_simple.o mixer_multirotor.o mixer.o mixer_group.o mixer_load.o
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
 #$(DEPS)
 $(ODIR)/%.o: %.cpp
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-$(ODIR)/%.o: ../../src/systemcmds/tests/%.c
+$(ODIR)/%.o: ../../src/systemcmds/tests/%.cpp
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 $(ODIR)/%.o: ../../src/modules/systemlib/%.cpp
@@ -26,6 +26,9 @@ $(ODIR)/%.o: ../../src/modules/systemlib/%.cpp
 $(ODIR)/%.o: ../../src/modules/systemlib/mixer/%.cpp
 	$(CC) -c -o $@ $< $(CFLAGS)
 
+$(ODIR)/%.o: ../../src/modules/systemlib/mixer/%.c
+	$(CC) -c -o $@ $< $(CFLAGS)
+
 #
 mixer_test: $(OBJ)
 	g++ -o $@ $^ $(CFLAGS) $(LIBS)
diff --git a/Tools/tests-host/mixer_test.cpp b/Tools/tests-host/mixer_test.cpp
index 5d92040f11..042322aadc 100644
--- a/Tools/tests-host/mixer_test.cpp
+++ b/Tools/tests-host/mixer_test.cpp
@@ -1,12 +1,12 @@
 #include <systemlib/mixer/mixer.h>
 #include <systemlib/err.h>
-
-extern int test_mixer(int argc, char *argv[]);
+#include "../../src/systemcmds/tests/tests.h"
 
 int main(int argc, char *argv[]) {
 	warnx("Host execution started");
 
-	char* args[] = {argv[0], "../../ROMFS/px4fmu_common/mixers/IO_pass.mix"};
+	char* args[] = {argv[0], "../../ROMFS/px4fmu_common/mixers/IO_pass.mix",
+				 "../../ROMFS/px4fmu_common/mixers/FMU_quad_w.mix"};
 
-	test_mixer(2, args);
+	test_mixer(3, args);
 }
\ No newline at end of file