diff --git a/ci-test.sh b/ci-test.sh index c79ad9703580d64f4db35e914c7d5c2eb7134fb6..2b8060ce46483f7f59862936c1f69ff30e6c68bc 100644 --- a/ci-test.sh +++ b/ci-test.sh @@ -4,4 +4,4 @@ set -e export PATH=/usr/local/bin:$PATH # Quad -(cd quad && make test) +(cd quad && make deep-clean && make && make test) diff --git a/quad/Makefile b/quad/Makefile index b5527481519cb1d1c611395e7202833bdbdb042a..f27a39d37141e31878c324788ef9c141db241be5 100644 --- a/quad/Makefile +++ b/quad/Makefile @@ -38,8 +38,8 @@ 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 - #ruby scripts/tests/test_unix_uart.rb + ruby scripts/tests/test_safety_checks.rb + ruby scripts/tests/test_unix_uart.rb clean: rm -rf $(INCDIR) $(LIBDIR) $(OUTDIR) $(EXEDIR) diff --git a/quad/scripts/tests/test_safety_checks.rb b/quad/scripts/tests/test_safety_checks.rb index f4e6904955db2d2fd99a220c6c79257e4ed4956a..38ca350087c819d18f58beafd66efdc240a2c76e 100644 --- a/quad/scripts/tests/test_safety_checks.rb +++ b/quad/scripts/tests/test_safety_checks.rb @@ -78,6 +78,8 @@ def check_led(on) assert_equal(led, on) end +puts("Setting up...") + script_dir = File.expand_path(File.dirname(__FILE__)) bin_dir = script_dir + "/../../bin/" Dir.chdir(bin_dir) @@ -92,8 +94,8 @@ sleep 1 ################# begin - puts("beginning tests") - + puts("Beginning tests...") + # Set gravity File.write(I2C_MPU_ACCEL_Z, -1 * GRAVITY) diff --git a/quad/scripts/tests/test_unix_uart.rb b/quad/scripts/tests/test_unix_uart.rb index 6621744e33f2a789bf191b33a58586b769f533f4..d26ed7e66b78a7e725ba5ec84f3257d654c57276 100644 --- a/quad/scripts/tests/test_unix_uart.rb +++ b/quad/scripts/tests/test_unix_uart.rb @@ -17,6 +17,8 @@ require 'test/unit/assertions' require 'thread' include Test::Unit::Assertions +puts("Setting up...") + script_dir = File.expand_path(File.dirname(__FILE__)) bin_dir = script_dir + "/../../bin/" Dir.chdir(bin_dir) @@ -32,6 +34,8 @@ sleep 1 begin + puts("Beginning tests...") + # Flip gear on File.write(GEAR, GEAR_ON) sleep 0.015