Fixing some ctest warnings

ctest_script.cmake

@@ -7,13 +7,15 @@
 # Set platform specific variables
 SITE_NAME( HOSTNAME )
 IF( ${HOSTNAME} STREQUAL "lap0086227" )
-
+    SET( COVERAGE_COMMAND /usr/bin/gcov )
+    SET( VALGRIND_COMMAND /usr/bin/valgrind )
+    SET( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
 ELSEIF( ${HOSTNAME} MATCHES "vayu" ) 
     SET( COVERAGE_COMMAND /usr/bin/gcov-4.6 )
     SET( VALGRIND_COMMAND /usr/bin/valgrind )
     SET( CUDA_FLAGS "--use_fast_math -Xptxas=-v -arch=sm_20" )
     SET( CUDA_HOST_COMPILER "/usr/bin/g++" )
-    SET(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+    SET( CTEST_CMAKE_GENERATOR "Unix Makefiles" )
 ELSE()
     MESSAGE( FATAL_ERROR "Unknown host: ${HOSTNAME}" )
 ENDIF()
@@ -32,42 +34,42 @@ ELSEIF( ${CTEST_SCRIPT_ARG} STREQUAL "debug" )
     SET( CTEST_COVERAGE_COMMAND ${COVERAGE_COMMAND} )
     SET( ENABLE_GCOV "true" )
     SET( USE_VALGRIND FALSE )
-    SET( USE_CUDA "false" )
+    SET( USE_CUDA FALSE )
 ELSEIF( ${CTEST_SCRIPT_ARG} STREQUAL "debug-cuda" )
     SET( CTEST_BUILD_NAME "LBPM-WIA-debug-cuda" )
     SET( CMAKE_BUILD_TYPE "Debug" )
     SET( CTEST_COVERAGE_COMMAND ${COVERAGE_COMMAND} )
     SET( ENABLE_GCOV "true" )
     SET( USE_VALGRIND FALSE )
-    SET( USE_CUDA "true" )
+    SET( USE_CUDA TRUE )
 ELSEIF( (${CTEST_SCRIPT_ARG} STREQUAL "optimized") OR (${CTEST_SCRIPT_ARG} STREQUAL "opt") )
     SET( CTEST_BUILD_NAME "LBPM-WIA-opt" )
     SET( CMAKE_BUILD_TYPE "Release" )
     SET( CTEST_COVERAGE_COMMAND )
     SET( ENABLE_GCOV "false" )
     SET( USE_VALGRIND FALSE )
-    SET( USE_CUDA "false" )
+    SET( USE_CUDA FALSE )
 ELSEIF( (${CTEST_SCRIPT_ARG} STREQUAL "optimized-cuda") OR (${CTEST_SCRIPT_ARG} STREQUAL "opt-cuda") )
     SET( CTEST_BUILD_NAME "LBPM-WIA-opt-cuda" )
     SET( CMAKE_BUILD_TYPE "Release" )
     SET( CTEST_COVERAGE_COMMAND )
     SET( ENABLE_GCOV "false" )
     SET( USE_VALGRIND FALSE )
-    SET( USE_CUDA "true" )
+    SET( USE_CUDA TRUE )
 ELSEIF( ${CTEST_SCRIPT_ARG} STREQUAL "valgrind" )
     SET( CTEST_BUILD_NAME "LBPM-WIA-valgrind" )
     SET( CMAKE_BUILD_TYPE "Debug" )
     SET( CTEST_COVERAGE_COMMAND )
     SET( ENABLE_GCOV "false" )
     SET( USE_VALGRIND TRUE )
-    SET( USE_CUDA "false" )
+    SET( USE_CUDA FALSE )
 ELSEIF( ${CTEST_SCRIPT_ARG} STREQUAL "valgrind-cuda" )
     SET( CTEST_BUILD_NAME "LBPM-WIA-valgrind-cuda" )
     SET( CMAKE_BUILD_TYPE "Debug" )
     SET( CTEST_COVERAGE_COMMAND )
     SET( ENABLE_GCOV "false" )
     SET( USE_VALGRIND TRUE )
-    SET( USE_CUDA "true" )
+    SET( USE_CUDA TRUE )
 ELSE()
     MESSAGE(FATAL_ERROR "Invalid build (${CTEST_SCRIPT_ARG}): ctest -S /path/to/script,build (debug/opt/valgrind")
 ENDIF()
@@ -108,6 +110,8 @@ SET( CTEST_DASHBOARD "Nightly" )
 SET( CTEST_TEST_TIMEOUT 300 )
 SET( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 500 )
 SET( CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 500 )
+SET( CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 10000 )
+SET( CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 10000 )
 SET( NIGHTLY_START_TIME "18:00:00 EST" )
 SET( CTEST_NIGHTLY_START_TIME "22:00:00 EST" )
 SET( CTEST_COMMAND "\"${CTEST_EXECUTABLE_NAME}\" -D ${CTEST_DASHBOARD}" )
@@ -136,11 +140,19 @@ FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "CTEST_TEST_CTEST:BOOL=1")
 SET( CTEST_SITE ${HOSTNAME} )
 CTEST_START("${CTEST_DASHBOARD}")
 CTEST_UPDATE()
-CTEST_CONFIGURE(
+IF ( USE_CUDA )
-    BUILD   ${CTEST_BINARY_DIRECTORY}
+    CTEST_CONFIGURE(
-    SOURCE  ${CTEST_SOURCE_DIRECTORY}
+        BUILD   ${CTEST_BINARY_DIRECTORY}
-    OPTIONS "-DCMAKE_C_COMPILER:PATH=mpicc;-DCMAKE_CXX_COMPILER:PATH=mpicxx;-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE};-DUSE_CUDA:BOOL=${USE_CUDA};-DCUDA_NVCC_FLAGS='${CUDA_FLAGS}';-DCUDA_HOST_COMPILER=${CUDA_HOST_COMPILER};-DLDLIBS:STRING=\"${LDLIBS}\";-DENABLE_GCOV:BOOL=${ENABLE_GCOV}"
+        SOURCE  ${CTEST_SOURCE_DIRECTORY}
-)
+        OPTIONS "-DCMAKE_C_COMPILER:PATH=mpicc;-DCMAKE_CXX_COMPILER:PATH=mpicxx;-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE};-DUSE_CUDA:BOOL=true;-DCUDA_NVCC_FLAGS='${CUDA_FLAGS}';-DCUDA_HOST_COMPILER=${CUDA_HOST_COMPILER};-DLDLIBS:STRING=\"${LDLIBS}\";-DENABLE_GCOV:BOOL=${ENABLE_GCOV}"
+    )
+ELSE() 
+    CTEST_CONFIGURE(
+            BUILD   ${CTEST_BINARY_DIRECTORY}
+            SOURCE  ${CTEST_SOURCE_DIRECTORY}
+            OPTIONS "-DCMAKE_C_COMPILER:PATH=mpicc;-DCMAKE_CXX_COMPILER:PATH=mpicxx;-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE};-DUSE_CUDA:BOOL=false;-DLDLIBS:STRING=\"${LDLIBS}\";-DENABLE_GCOV:BOOL=${ENABLE_GCOV}"
+        )
+ENDIF()
 CTEST_BUILD()
 IF ( USE_VALGRIND_MATLAB )
     CTEST_TEST( INCLUDE MATLAB--test_hello_world  PARALLEL_LEVEL ${N_PROCS} )

tests/hello_world.cpp

@@ -18,8 +18,6 @@ int main (int argc, char **argv)
     // set the error code
     // Note: the error code should be consistent across all processors
     int error = 0;
-    if ( nprocs==4 )
-        error = 1;
     
     // Finished
 	MPI_Barrier(MPI_COMM_WORLD);

tests/pmmc_cylinder.cpp

@@ -9,7 +9,7 @@
 #define N 60
 #define PI 3.14159
 
-int main (char *argc, char **argv)
+int main (int argc, char **argv)
 {
 	
 	//  printf("Radius = %s \n,"RADIUS);  

tests/testCommunication.cpp

@@ -163,6 +163,20 @@ int test_communication( MPI_Comm comm, int nprocx, int nprocy, int nprocz )
     MPI_Barrier(comm);
     if (rank==0)    printf ("RecvLists finished\n");
     
+    // Free memory
+    delete [] sendList_x,  delete [] sendList_y,  delete [] sendList_z;
+    delete [] sendList_X,  delete [] sendList_Y,  delete [] sendList_Z;
+    delete [] sendList_xy, delete [] sendList_xz, delete [] sendList_yz;
+    delete [] sendList_xY, delete [] sendList_xZ, delete [] sendList_yZ;
+    delete [] sendList_Xy, delete [] sendList_Xz, delete [] sendList_Yz;
+    delete [] sendList_XY, delete [] sendList_XZ, delete [] sendList_YZ;
+    delete [] recvList_x,  delete [] recvList_y,  delete [] recvList_z;
+    delete [] recvList_X,  delete [] recvList_Y,  delete [] recvList_Z;
+    delete [] recvList_xy, delete [] recvList_xz, delete [] recvList_yz;
+    delete [] recvList_xY, delete [] recvList_xZ, delete [] recvList_yZ;
+    delete [] recvList_Xy, delete [] recvList_Xz, delete [] recvList_Yz;
+    delete [] recvList_XY, delete [] recvList_XZ, delete [] recvList_YZ;
+
     // Finished with no errors
     return 0;
 }