Add unit test program, xrdshmap, to teh test suite.

Fix pedantic compiler complaints. Add pthread library to the XrdSsiShMap.so build.
xrootd · Jun 2, 2015 · db3603d · db3603d
1 parent f43a621
commit db3603d
Show file tree

Hide file tree

Showing 5 changed files with 1,072 additions and 2 deletions.
diff --git a/src/XrdSsi.cmake b/src/XrdSsi.cmake
@@ -69,7 +69,8 @@ XrdSsi/XrdSsiShMat.cc                  XrdSsi/XrdSsiShMat.hh)
 
 target_link_libraries(
   XrdSsiShMap
-  ${ZLIB_LIBRARY} )
+  ${ZLIB_LIBRARY}
+  pthread )
 
 set_target_properties(
   XrdSsiShMap

diff --git a/src/XrdSsi/XrdSsiShMap.icc b/src/XrdSsi/XrdSsiShMap.icc
@@ -312,7 +312,6 @@ bool XrdSsi::ShMap<T>::Resize(XrdSsi::ShMap_Parms *parms)
 {
    XrdSsi::ShMap_Parms   rszParms(XrdSsi::ShMap_Parms::ForResize);
    XrdSsiShMat::CRZParms crzParms;
-   int rc;
 
 // First see if this object is already attached.
 //

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 
 add_subdirectory( common )
 add_subdirectory( XrdClTests )
+add_subdirectory( XrdSsiTests )
 
 if( BUILD_CEPH )
   include( XrdCephTests )

diff --git a/tests/XrdSsiTests/CMakeLists.txt b/tests/XrdSsiTests/CMakeLists.txt
@@ -0,0 +1,19 @@
+
+include( XRootDCommon )
+
+add_executable(
+  xrdshmap
+  XrdShMap.cc
+)
+
+target_link_libraries(
+  xrdshmap
+  XrdSsiShMap )
+
+#-------------------------------------------------------------------------------
+# Install
+#-------------------------------------------------------------------------------
+install(
+  TARGETS xrdshmap
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )