Переглянути джерело

Changes file structure for test infrastructure

CapXilinx 12 роки тому
батько
коміт
690f0ecae5
75 змінених файлів з 3 додано та 18 видалено
  1. 3 18
      source/CMakeLists.txt
  2. 0 0
      source/buildsupport/LM3S8962/OpENer_PLATFORM_INCLUDES.cmake
  3. 0 0
      source/buildsupport/OpENer.cmake
  4. 0 0
      source/buildsupport/OpENer_CIP_Object_generator.cmake
  5. 0 0
      source/buildsupport/OpENer_Tests.cmake
  6. 0 0
      source/buildsupport/OpENer_function_checks.cmake
  7. 0 0
      source/buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake
  8. 0 0
      source/buildsupport/WIN32/OpENer_PLATFORM_INCLUDES.cmake
  9. 0 0
      source/contrib/msinttypes/README
  10. 0 0
      source/contrib/msinttypes/inttypes.h
  11. 0 0
      source/doc/coding_rules/opener_coding_rules.pdf
  12. 0 0
      source/doc/coding_rules/src/opener_coding_rules.tex
  13. 0 0
      source/opener.doxyfile
  14. 0 0
      source/src/cip/CMakeLists.txt
  15. 0 0
      source/src/cip/appcontype.c
  16. 0 0
      source/src/cip/appcontype.h
  17. 0 0
      source/src/cip/cipassembly.c
  18. 0 0
      source/src/cip/cipassembly.h
  19. 0 0
      source/src/cip/cipclass3connection.c
  20. 0 0
      source/src/cip/cipclass3connection.h
  21. 0 0
      source/src/cip/cipcommon.c
  22. 0 0
      source/src/cip/cipcommon.h
  23. 0 0
      source/src/cip/cipconnectionmanager.c
  24. 0 0
      source/src/cip/cipconnectionmanager.h
  25. 0 0
      source/src/cip/ciperror.h
  26. 0 0
      source/src/cip/cipethernetlink.c
  27. 0 0
      source/src/cip/cipethernetlink.h
  28. 0 0
      source/src/cip/cipidentity.c
  29. 0 0
      source/src/cip/cipidentity.h
  30. 0 0
      source/src/cip/cipioconnection.c
  31. 0 0
      source/src/cip/cipioconnection.h
  32. 0 0
      source/src/cip/cipmessagerouter.c
  33. 0 0
      source/src/cip/cipmessagerouter.h
  34. 0 0
      source/src/cip/ciptcpipinterface.c
  35. 0 0
      source/src/cip/ciptcpipinterface.h
  36. 0 0
      source/src/cip/ciptypes.h
  37. 0 0
      source/src/cip_objects/CMakeLists.txt
  38. 0 0
      source/src/enet_encap/CMakeLists.txt
  39. 0 0
      source/src/enet_encap/cpf.c
  40. 0 0
      source/src/enet_encap/cpf.h
  41. 0 0
      source/src/enet_encap/encap.c
  42. 0 0
      source/src/enet_encap/encap.h
  43. 0 0
      source/src/enet_encap/endianconv.c
  44. 0 0
      source/src/enet_encap/endianconv.h
  45. 0 0
      source/src/opener_api.h
  46. 0 0
      source/src/ports/CMakeLists.txt
  47. 0 0
      source/src/ports/POSIX/CMakeLists.txt
  48. 0 0
      source/src/ports/POSIX/main.c
  49. 0 0
      source/src/ports/POSIX/networkhandler.c
  50. 0 0
      source/src/ports/POSIX/networkhandler.h
  51. 0 0
      source/src/ports/POSIX/sample_application/CMakeLists.txt
  52. 0 0
      source/src/ports/POSIX/sample_application/opener_user_conf.h
  53. 0 0
      source/src/ports/POSIX/sample_application/sampleapplication.c
  54. 0 0
      source/src/ports/WIN32/CMakeLists.txt
  55. 0 0
      source/src/ports/WIN32/main.c
  56. 0 0
      source/src/ports/WIN32/networkhandler.c
  57. 0 0
      source/src/ports/WIN32/networkhandler.h
  58. 0 0
      source/src/ports/WIN32/sample_application/CMakeLists.txt
  59. 0 0
      source/src/ports/WIN32/sample_application/opener_user_conf.h
  60. 0 0
      source/src/ports/WIN32/sample_application/sampleapplication.c
  61. 0 0
      source/src/trace.h
  62. 0 0
      source/src/typedefs.h
  63. 0 0
      source/src/utils/CMakeLists.txt
  64. 0 0
      source/src/utils/mtrandom.c
  65. 0 0
      source/src/utils/mtrandom.h
  66. 0 0
      source/src/utils/random.c
  67. 0 0
      source/src/utils/random.h
  68. 0 0
      source/src/utils/xorshiftrandom.c
  69. 0 0
      source/src/utils/xorshiftrandom.h
  70. 0 0
      source/tests/CMakeLists.txt
  71. 0 0
      source/tests/main.cpp
  72. 0 0
      source/tests/utils/CMakeLists.txt
  73. 0 0
      source/tests/utils/MTRandomTests.cpp
  74. 0 0
      source/tests/utils/randomTests.cpp
  75. 0 0
      source/tests/utils/xorshiftrandomtests.cpp

+ 3 - 18
src/CMakeLists.txt → source/CMakeLists.txt

@@ -14,7 +14,7 @@ project( OpENer C )
 set( OpENer_VERSION_MAJOR 1 )
 set( OpENer_VERSION_MINOR 2 )
 
-find_path( OpENer_BUILDSUPPORT_DIR OpENer.cmake ${PROJECT_SOURCE_DIR}/../buildsupport )
+find_path( OpENer_BUILDSUPPORT_DIR OpENer.cmake ${PROJECT_SOURCE_DIR}/buildsupport )
  
 INCLUDE( ${OpENer_BUILDSUPPORT_DIR}/OpENer.cmake )
 
@@ -68,7 +68,7 @@ if( OpENer_TESTS )
   enable_language( CXX )
   set( CPPUTEST_HOME "" CACHE PATH "Path to CppUTest directory" )
   INCLUDE( ${OpENer_BUILDSUPPORT_DIR}/OpENer_Tests.cmake )
-  add_subdirectory(tests)
+  add_subdirectory( tests )
 endif( OpENer_TESTS )
 
 #######################################
@@ -90,19 +90,4 @@ include(${OpENer_BUILDSUPPORT_DIR}/OpENer_CIP_Object_generator.cmake)
 #######################################
 # Add subdirectories                  #
 #######################################
-add_subdirectory(cip)
-add_subdirectory(cip_objects)
-add_subdirectory(enet_encap)
-add_subdirectory(ports)
-add_subdirectory(utils)
-
-#######################################
-# Add common includes                 #
-#######################################
-opener_common_includes()
-
-#######################################
-# Add platfrom specific things        #
-#######################################
-
-opener_platform_support("INCLUDES")
+add_subdirectory( src )

+ 0 - 0
buildsupport/LM3S8962/OpENer_PLATFORM_INCLUDES.cmake → source/buildsupport/LM3S8962/OpENer_PLATFORM_INCLUDES.cmake


+ 0 - 0
buildsupport/OpENer.cmake → source/buildsupport/OpENer.cmake


+ 0 - 0
buildsupport/OpENer_CIP_Object_generator.cmake → source/buildsupport/OpENer_CIP_Object_generator.cmake


+ 0 - 0
buildsupport/OpENer_Tests.cmake → source/buildsupport/OpENer_Tests.cmake


+ 0 - 0
buildsupport/OpENer_function_checks.cmake → source/buildsupport/OpENer_function_checks.cmake


+ 0 - 0
buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake → source/buildsupport/POSIX/OpENer_PLATFORM_INCLUDES.cmake


+ 0 - 0
buildsupport/WIN32/OpENer_PLATFORM_INCLUDES.cmake → source/buildsupport/WIN32/OpENer_PLATFORM_INCLUDES.cmake


+ 0 - 0
contrib/msinttypes/README → source/contrib/msinttypes/README


+ 0 - 0
contrib/msinttypes/inttypes.h → source/contrib/msinttypes/inttypes.h


+ 0 - 0
doc/coding_rules/opener_coding_rules.pdf → source/doc/coding_rules/opener_coding_rules.pdf


+ 0 - 0
doc/coding_rules/src/opener_coding_rules.tex → source/doc/coding_rules/src/opener_coding_rules.tex


+ 0 - 0
opener.doxyfile → source/opener.doxyfile


+ 0 - 0
src/cip/CMakeLists.txt → source/src/cip/CMakeLists.txt


+ 0 - 0
src/cip/appcontype.c → source/src/cip/appcontype.c


+ 0 - 0
src/cip/appcontype.h → source/src/cip/appcontype.h


+ 0 - 0
src/cip/cipassembly.c → source/src/cip/cipassembly.c


+ 0 - 0
src/cip/cipassembly.h → source/src/cip/cipassembly.h


+ 0 - 0
src/cip/cipclass3connection.c → source/src/cip/cipclass3connection.c


+ 0 - 0
src/cip/cipclass3connection.h → source/src/cip/cipclass3connection.h


+ 0 - 0
src/cip/cipcommon.c → source/src/cip/cipcommon.c


+ 0 - 0
src/cip/cipcommon.h → source/src/cip/cipcommon.h


+ 0 - 0
src/cip/cipconnectionmanager.c → source/src/cip/cipconnectionmanager.c


+ 0 - 0
src/cip/cipconnectionmanager.h → source/src/cip/cipconnectionmanager.h


+ 0 - 0
src/cip/ciperror.h → source/src/cip/ciperror.h


+ 0 - 0
src/cip/cipethernetlink.c → source/src/cip/cipethernetlink.c


+ 0 - 0
src/cip/cipethernetlink.h → source/src/cip/cipethernetlink.h


+ 0 - 0
src/cip/cipidentity.c → source/src/cip/cipidentity.c


+ 0 - 0
src/cip/cipidentity.h → source/src/cip/cipidentity.h


+ 0 - 0
src/cip/cipioconnection.c → source/src/cip/cipioconnection.c


+ 0 - 0
src/cip/cipioconnection.h → source/src/cip/cipioconnection.h


+ 0 - 0
src/cip/cipmessagerouter.c → source/src/cip/cipmessagerouter.c


+ 0 - 0
src/cip/cipmessagerouter.h → source/src/cip/cipmessagerouter.h


+ 0 - 0
src/cip/ciptcpipinterface.c → source/src/cip/ciptcpipinterface.c


+ 0 - 0
src/cip/ciptcpipinterface.h → source/src/cip/ciptcpipinterface.h


+ 0 - 0
src/cip/ciptypes.h → source/src/cip/ciptypes.h


+ 0 - 0
src/cip_objects/CMakeLists.txt → source/src/cip_objects/CMakeLists.txt


+ 0 - 0
src/enet_encap/CMakeLists.txt → source/src/enet_encap/CMakeLists.txt


+ 0 - 0
src/enet_encap/cpf.c → source/src/enet_encap/cpf.c


+ 0 - 0
src/enet_encap/cpf.h → source/src/enet_encap/cpf.h


+ 0 - 0
src/enet_encap/encap.c → source/src/enet_encap/encap.c


+ 0 - 0
src/enet_encap/encap.h → source/src/enet_encap/encap.h


+ 0 - 0
src/enet_encap/endianconv.c → source/src/enet_encap/endianconv.c


+ 0 - 0
src/enet_encap/endianconv.h → source/src/enet_encap/endianconv.h


+ 0 - 0
src/opener_api.h → source/src/opener_api.h


+ 0 - 0
src/ports/CMakeLists.txt → source/src/ports/CMakeLists.txt


+ 0 - 0
src/ports/POSIX/CMakeLists.txt → source/src/ports/POSIX/CMakeLists.txt


+ 0 - 0
src/ports/POSIX/main.c → source/src/ports/POSIX/main.c


+ 0 - 0
src/ports/POSIX/networkhandler.c → source/src/ports/POSIX/networkhandler.c


+ 0 - 0
src/ports/POSIX/networkhandler.h → source/src/ports/POSIX/networkhandler.h


+ 0 - 0
src/ports/POSIX/sample_application/CMakeLists.txt → source/src/ports/POSIX/sample_application/CMakeLists.txt


+ 0 - 0
src/ports/POSIX/sample_application/opener_user_conf.h → source/src/ports/POSIX/sample_application/opener_user_conf.h


+ 0 - 0
src/ports/POSIX/sample_application/sampleapplication.c → source/src/ports/POSIX/sample_application/sampleapplication.c


+ 0 - 0
src/ports/WIN32/CMakeLists.txt → source/src/ports/WIN32/CMakeLists.txt


+ 0 - 0
src/ports/WIN32/main.c → source/src/ports/WIN32/main.c


+ 0 - 0
src/ports/WIN32/networkhandler.c → source/src/ports/WIN32/networkhandler.c


+ 0 - 0
src/ports/WIN32/networkhandler.h → source/src/ports/WIN32/networkhandler.h


+ 0 - 0
src/ports/WIN32/sample_application/CMakeLists.txt → source/src/ports/WIN32/sample_application/CMakeLists.txt


+ 0 - 0
src/ports/WIN32/sample_application/opener_user_conf.h → source/src/ports/WIN32/sample_application/opener_user_conf.h


+ 0 - 0
src/ports/WIN32/sample_application/sampleapplication.c → source/src/ports/WIN32/sample_application/sampleapplication.c


+ 0 - 0
src/trace.h → source/src/trace.h


+ 0 - 0
src/typedefs.h → source/src/typedefs.h


+ 0 - 0
src/utils/CMakeLists.txt → source/src/utils/CMakeLists.txt


+ 0 - 0
src/utils/mtrandom.c → source/src/utils/mtrandom.c


+ 0 - 0
src/utils/mtrandom.h → source/src/utils/mtrandom.h


+ 0 - 0
src/utils/random.c → source/src/utils/random.c


+ 0 - 0
src/utils/random.h → source/src/utils/random.h


+ 0 - 0
src/utils/xorshiftrandom.c → source/src/utils/xorshiftrandom.c


+ 0 - 0
src/utils/xorshiftrandom.h → source/src/utils/xorshiftrandom.h


+ 0 - 0
src/tests/CMakeLists.txt → source/tests/CMakeLists.txt


+ 0 - 0
src/tests/main.cpp → source/tests/main.cpp


+ 0 - 0
src/tests/utils/CMakeLists.txt → source/tests/utils/CMakeLists.txt


+ 0 - 0
src/tests/utils/MTRandomTests.cpp → source/tests/utils/MTRandomTests.cpp


+ 0 - 0
src/tests/utils/randomTests.cpp → source/tests/utils/randomTests.cpp


+ 0 - 0
src/tests/utils/xorshiftrandomtests.cpp → source/tests/utils/xorshiftrandomtests.cpp