Remove debug output (and shorten test names)

diff --git a/simgear/misc/CMakeLists.txt b/simgear/misc/CMakeLists.txt
index d6d37b7f0672fa6faa605336f524ed989d606c7b..f92602857bea5271d2e009b9b529d54d72cbd519 100644 (file)
--- 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 ac9e7e0886a0af838e447a0d6c20f2f8896dc307..129aae83218457fe0686a7fcee65195f7c6f2c92 100644 (file)
--- 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 993a303e2bf5e89eb0be695be9c1f6be8221b120..3f7e9e3ccaa605cbf7432eb8395358e03b721e81 100644 (file)
--- 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 416b74af922dd709710fbceedab8ff87f55bc083..69bb545f8e76ebb7e20cea143fee4fcc44377263 100644 (file)
--- 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 8a03538a1528ae62ea5ab03ad337b5bb39d409bf..9c2ff4fbcb08c2f533bd45880d5027e5ca18dcc9 100644 (file)
--- a/simgear/scene/model/SGPickAnimation.cxx
+++ b/simgear/scene/model/SGPickAnimation.cxx
@@ -377,7 +377,7 @@ SGPickAnimation::apply(osg::Group& group)
       
     std::list<std::string>::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<osg::Group> renderGroup, pickGroup;      

diff --git a/simgear/scene/model/SGTrackToAnimation.cxx b/simgear/scene/model/SGTrackToAnimation.cxx
index 9541520775b6b0c20b3aad6c4814a83d6b44df4a..20f55e11b7ada8dae04ec01c41299e2c4d59f7f8 100644 (file)
--- 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 5ee97f85ed7297142db6fde102ebc685b572f50b..3586844e42b829675eada3f98c9f4d65ad156fe1 100644 (file)
--- 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 0cc3f79d8867cefc0be122825b8b464e99999cb0..c69c7de9f670a773ecf1d3f88ce366ac022ef3e9 100644 (file)
--- 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)