From 5c5e2a0f2f80b4a27c35f5685681c86a191d0a9e Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Fri, 26 Apr 2013 00:13:35 +0200 Subject: [PATCH] Remove debug output (and shorten test names) --- simgear/misc/CMakeLists.txt | 6 +++--- simgear/nasal/cppbind/CMakeLists.txt | 2 +- simgear/props/CMakeLists.txt | 6 +++--- simgear/scene/model/CMakeLists.txt | 2 +- simgear/scene/model/SGPickAnimation.cxx | 2 +- simgear/scene/model/SGTrackToAnimation.cxx | 3 --- simgear/scene/util/CMakeLists.txt | 2 +- simgear/structure/CMakeLists.txt | 4 ++-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt index d6d37b7f..f9260285 100644 --- a/simgear/misc/CMakeLists.txt +++ b/simgear/misc/CMakeLists.txt @@ -39,15 +39,15 @@ add_test(tabbed_values ${EXECUTABLE_OUTPUT_PATH}/test_tabbed_values) target_link_libraries(test_tabbed_values ${TEST_LIBS}) add_executable(test_strings strutils_test.cxx ) -add_test(test_strings ${EXECUTABLE_OUTPUT_PATH}/test_strings) +add_test(strings ${EXECUTABLE_OUTPUT_PATH}/test_strings) target_link_libraries(test_strings ${TEST_LIBS}) add_executable(test_streams sgstream_test.cxx ) -add_test(test_streams ${EXECUTABLE_OUTPUT_PATH}/test_streams) +add_test(streams ${EXECUTABLE_OUTPUT_PATH}/test_streams) target_link_libraries(test_streams ${TEST_LIBS}) add_executable(test_path path_test.cxx ) -add_test(test_path ${EXECUTABLE_OUTPUT_PATH}/test_path) +add_test(path ${EXECUTABLE_OUTPUT_PATH}/test_path) target_link_libraries(test_path ${TEST_LIBS}) endif(ENABLE_TESTS) diff --git a/simgear/nasal/cppbind/CMakeLists.txt b/simgear/nasal/cppbind/CMakeLists.txt index ac9e7e08..129aae83 100644 --- a/simgear/nasal/cppbind/CMakeLists.txt +++ b/simgear/nasal/cppbind/CMakeLists.txt @@ -28,6 +28,6 @@ simgear_component(nasal/cppbind/detail nasal/cppbind/detail "" "${DETAIL_HEADERS if(ENABLE_TESTS) add_executable(test_cppbind cppbind_test.cxx) - add_test(test_cppbind ${EXECUTABLE_OUTPUT_PATH}/test_cppbind) + add_test(cppbind ${EXECUTABLE_OUTPUT_PATH}/test_cppbind) target_link_libraries(test_cppbind ${TEST_LIBS}) endif(ENABLE_TESTS) \ No newline at end of file diff --git a/simgear/props/CMakeLists.txt b/simgear/props/CMakeLists.txt index 993a303e..3f7e9e3c 100644 --- a/simgear/props/CMakeLists.txt +++ b/simgear/props/CMakeLists.txt @@ -37,14 +37,14 @@ if(ENABLE_TESTS) add_executable(test_props props_test.cxx) target_link_libraries(test_props ${TEST_LIBS}) -add_test(test_props ${EXECUTABLE_OUTPUT_PATH}/test_props) +add_test(props ${EXECUTABLE_OUTPUT_PATH}/test_props) add_executable(test_propertyObject propertyObject_test.cxx) target_link_libraries(test_propertyObject ${TEST_LIBS}) -add_test(test_propertyObject ${EXECUTABLE_OUTPUT_PATH}/test_propertyObject) +add_test(propertyObject ${EXECUTABLE_OUTPUT_PATH}/test_propertyObject) add_executable(test_easing_functions easing_functions_test.cxx) target_link_libraries(test_easing_functions ${TEST_LIBS}) -add_test(test_easing_functions ${EXECUTABLE_OUTPUT_PATH}/test_easing_functions) +add_test(easing_functions ${EXECUTABLE_OUTPUT_PATH}/test_easing_functions) endif(ENABLE_TESTS) diff --git a/simgear/scene/model/CMakeLists.txt b/simgear/scene/model/CMakeLists.txt index 416b74af..69bb545f 100644 --- a/simgear/scene/model/CMakeLists.txt +++ b/simgear/scene/model/CMakeLists.txt @@ -60,6 +60,6 @@ if(ENABLE_TESTS) add_executable(test_animations animation_test.cxx) target_link_libraries(test_animations ${TEST_LIBS} ${OPENSCENEGRAPH_LIBRARIES}) - add_test(test_animations ${EXECUTABLE_OUTPUT_PATH}/test_animations) + add_test(animations ${EXECUTABLE_OUTPUT_PATH}/test_animations) endif(ENABLE_TESTS) \ No newline at end of file diff --git a/simgear/scene/model/SGPickAnimation.cxx b/simgear/scene/model/SGPickAnimation.cxx index 8a03538a..9c2ff4fb 100644 --- a/simgear/scene/model/SGPickAnimation.cxx +++ b/simgear/scene/model/SGPickAnimation.cxx @@ -377,7 +377,7 @@ SGPickAnimation::apply(osg::Group& group) std::list::iterator it = std::find(_objectNames.begin(), _objectNames.end(), child->getName()); if (it != _objectNames.end()) { - _objectNames.erase(it); + //_objectNames.erase(it); install(*child); osg::ref_ptr renderGroup, pickGroup; diff --git a/simgear/scene/model/SGTrackToAnimation.cxx b/simgear/scene/model/SGTrackToAnimation.cxx index 95415207..20f55e11 100644 --- a/simgear/scene/model/SGTrackToAnimation.cxx +++ b/simgear/scene/model/SGTrackToAnimation.cxx @@ -209,9 +209,6 @@ SGTrackToAnimation::SGTrackToAnimation( osg::Node* node, _target_group(0) { std::string target = configNode->getStringValue("target-name"); - std::cout << "track " << target << std::endl; - configNode->printOn(std::cout); - FindGroupVisitor target_finder(target); node->accept(target_finder); diff --git a/simgear/scene/util/CMakeLists.txt b/simgear/scene/util/CMakeLists.txt index 5ee97f85..3586844e 100644 --- a/simgear/scene/util/CMakeLists.txt +++ b/simgear/scene/util/CMakeLists.txt @@ -57,7 +57,7 @@ simgear_scene_component(util scene/util "${SOURCES}" "${HEADERS}") if(ENABLE_TESTS) add_executable(test_parse_color parse_color_test.cxx ) -add_test(test_parse_color ${EXECUTABLE_OUTPUT_PATH}/test_parse_color) +add_test(parse_color ${EXECUTABLE_OUTPUT_PATH}/test_parse_color) target_link_libraries(test_parse_color ${TEST_LIBS}) endif(ENABLE_TESTS) diff --git a/simgear/structure/CMakeLists.txt b/simgear/structure/CMakeLists.txt index 0cc3f79d..c69c7de9 100644 --- a/simgear/structure/CMakeLists.txt +++ b/simgear/structure/CMakeLists.txt @@ -47,10 +47,10 @@ if(ENABLE_TESTS) add_executable(test_state_machine state_machine_test.cxx) target_link_libraries(test_state_machine ${TEST_LIBS}) -add_test(test_state_machine ${EXECUTABLE_OUTPUT_PATH}/test_state_machine) +add_test(state_machine ${EXECUTABLE_OUTPUT_PATH}/test_state_machine) add_executable(test_expressions expression_test.cxx) target_link_libraries(test_expressions ${TEST_LIBS}) -add_test(test_expressions ${EXECUTABLE_OUTPUT_PATH}/test_expressions) +add_test(expressions ${EXECUTABLE_OUTPUT_PATH}/test_expressions) endif(ENABLE_TESTS) -- 2.39.5