From 47bf22d8f70af2924ce7c227be49db4fb8c020f0 Mon Sep 17 00:00:00 2001
From: Brendan Bartels <bbartels@iastate.edu>
Date: Thu, 30 Mar 2017 10:03:10 -0500
Subject: [PATCH] quad: use "make test" target to run the functional tests

---
 ci-build.sh   |  2 +-
 ci-test.sh    | 10 +++-------
 quad/Makefile |  3 ++-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ci-build.sh b/ci-build.sh
index 3d236441d..182821023 100644
--- a/ci-build.sh
+++ b/ci-build.sh
@@ -4,4 +4,4 @@ set -e
 
 # Quad Libraries and Boot image
 (cd quad && make)
-#(cd groundStation && make) 
+#(cd groundStation && make)
diff --git a/ci-test.sh b/ci-test.sh
index 61d28b915..c79ad9703 100644
--- a/ci-test.sh
+++ b/ci-test.sh
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 set -e
-
-# Quad Library Unit tests
-(cd quad && make && make test)
-
-# Quad functional safety tests
 export PATH=/usr/local/bin:$PATH
-echo $(ruby --version)
-ruby quad/scripts/tests/test_safety_checks.rb
+
+# Quad
+(cd quad && make test)
diff --git a/quad/Makefile b/quad/Makefile
index 5b25b37be..98427ec80 100644
--- a/quad/Makefile
+++ b/quad/Makefile
@@ -34,10 +34,11 @@ boot: $(BOOT)
 run-virt-quad:
 	$(MAKE) -C src/virt_quad run
 
-test:
+test: all
 	$(MAKE) -C src/queue test
 	$(MAKE) -C src/computation_graph test
 	$(MAKE) -C src/quad_app test
+	ruby scripts/tests/test_safety_checks.rb
 
 clean:
 	rm -rf $(INCDIR) $(LIBDIR) $(OUTDIR) $(EXEDIR)
-- 
GitLab