Merge branch 'win_unit_tests' of https://github.com/RussTedrake/drake

vcmman · Apr 25, 2015 · 076e44c · 076e44c
2 parents 0363890 + 92b2174
commit 076e44c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,12 @@ endif()
 include(cmake/mex.cmake)
 mex_setup()
 
+# frustratingly, this didn't seem to work, so instead I've added a -C argument to both the Makefile and the drake-admin/runUnitTests scripts
+#if (NOT CTEST_CONFIGURATION_TYPE)
+#   set(CTEST_CONFIGURATION_TYPE ${CMAKE_BUILD_TYPE})
+#   message("Setting CTEST Configuration Type to ${CTEST_CONFIGURATION_TYPE}")
+#endif()
+
 enable_testing()
 include(CTest)
 

diff --git a/Makefile b/Makefile
@@ -71,7 +71,7 @@ mlint	:
 	matlab -nodisplay -r "addpath(fullfile(pwd,'thirdParty','runmlint')); runmlint('.mlintopts'); exit"
 
 test	:  configure
-	-@cd pod-build && ctest -D Experimental --output-on-failure --timeout 300 
+	-@cd pod-build && ctest -D Experimental -C $(BUILD_TYPE) --output-on-failure --timeout 300 
 
 test_continuous : configure
 	while true; do $(MAKE) Continuous; sleep 300; done

diff --git a/cmake b/cmake