Add support for NaN and inf in device properties (#360) (#362)

Fix #360
tango-controls · Apr 28, 2017 · cfe4c9c · cfe4c9c
1 parent 4a00c8e
commit cfe4c9c
Show file tree

Hide file tree

Showing 5 changed files with 514 additions and 31 deletions.
diff --git a/cpp_test_suite/README b/cpp_test_suite/README
@@ -160,7 +160,7 @@ This part is a guide to test suites development with the use of the CxxTest fram
  2.1. Create a new test suite
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To create a new test suite simply copy and rename the 'cxx_suite_template.cpp' file which can be found in the 'new_tests'
+To create a new test suite simply copy and rename the 'cxx_template.cpp' file which can be found in the 'new_tests'
 directory.
 
 Modify the header guard 'TemplateTestSuite_h' (lines 1, 2 and the last one) by providing your test suite name. Follow

diff --git a/cpp_test_suite/cxxtest/CMakeLists.txt b/cpp_test_suite/cxxtest/CMakeLists.txt
@@ -35,6 +35,7 @@ execute_process(COMMAND python cxxtestgen.py --template=${CMAKE_CURRENT_SOURCE_D
         ../../new_tests/cxx_pipe_conf.cpp
         ../../new_tests/cxx_pipe.cpp
         ../../new_tests/cxx_z00_dyn_cmd.cpp
+        ../../new_tests/cxx_nan_inf_in_prop.cpp
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
 add_executable(runner $<TARGET_OBJECTS:compare_test_object> ${CMAKE_CURRENT_SOURCE_DIR}/runner.cpp)

diff --git a/cpp_test_suite/environment/CMakeLists.txt b/cpp_test_suite/environment/CMakeLists.txt
@@ -6,7 +6,7 @@ execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/pre_test.sh)
 configure_file(post_test.sh.cmake post_test.sh @ONLY)
 execute_process(COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/post_test.sh)
 
-execute_process(COMMAND chmod +x setup.sh)
+execute_process(COMMAND chmod +x ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh)
 add_custom_target(start-tango ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         SOURCES setup.sh)
@@ -17,7 +17,7 @@ add_custom_target(run-tests ${CMAKE_CURRENT_BINARY_DIR}/run.sh
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         SOURCES run.sh.cmake)
 
-execute_process(COMMAND chmod +x shutdown.sh)
+execute_process(COMMAND chmod +x ${CMAKE_CURRENT_SOURCE_DIR}/shutdown.sh)
 add_custom_target(stop-tango ${CMAKE_CURRENT_SOURCE_DIR}/shutdown.sh
         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
         SOURCES shutdown.sh)