Merge pull request #347 from peastman/master

Removed some obsolete test code

platforms/cuda/tests/CMakeLists.txt

@@ -31,35 +31,6 @@ FOREACH(TEST_PROG ${TEST_PROGS})
         SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS}")
     ENDIF (APPLE)
 
-    IF( ${TEST_ROOT} STREQUAL "TestCUDAGBSAOBCForce2" )
-
-        SET(DEFINE_STRING "-DTEST_PLATFORM=1 ")
-        IF( INCLUDE_SERIALIZATION )
-            SET(DEFINE_STRING "${DEFINE_STRING} -DOPENMM_SERIALIZE ")
-        ENDIF( INCLUDE_SERIALIZATION )
-    
-        # nonbond
-
-        SET(NONBOND_DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=0")
-        SET(NONBOND_TEST "TestCUDANonbondedForce2")
-        ADD_EXECUTABLE(${NONBOND_TEST} ${TEST_PROG})
-
-        SET_TARGET_PROPERTIES(${NONBOND_TEST} PROPERTIES COMPILE_FLAGS ${NONBOND_DEFINE_STRING} )
-        ADD_TEST(${NONBOND_TEST} ${EXECUTABLE_OUTPUT_PATH}/${NONBOND_TEST})
-
-        # OBC
-
-        SET(DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=1")
-        SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES COMPILE_FLAGS ${DEFINE_STRING} )
-
-        IF( INCLUDE_SERIALIZATION )
-            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
-            TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
-        ELSE( INCLUDE_SERIALIZATION )
-            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET})
-        ENDIF( INCLUDE_SERIALIZATION )
-
-    ENDIF( ${TEST_ROOT} STREQUAL "TestCUDAGBSAOBCForce2" )
     ADD_TEST(${TEST_ROOT}Single ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} single)
     IF (OPENMM_BUILD_CUDA_DOUBLE_PRECISION_TESTS)
         ADD_TEST(${TEST_ROOT}Mixed ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} mixed)

platforms/opencl/tests/CMakeLists.txt

@@ -27,35 +27,6 @@ FOREACH(TEST_PROG ${TEST_PROGS})
     TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET})
     SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS}")
 
-    IF( ${TEST_ROOT} STREQUAL "TestOpenCLGBSAOBCForce2" )
-
-        SET(DEFINE_STRING "-DTEST_PLATFORM=1 ")
-        IF( INCLUDE_SERIALIZATION )
-            SET(DEFINE_STRING "${DEFINE_STRING} -DOPENMM_SERIALIZE ")
-        ENDIF( INCLUDE_SERIALIZATION )
-    
-        # nonbond
-
-        SET(NONBOND_DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=0")
-        SET(NONBOND_TEST "TestOpenCLNonbondedForce2")
-        ADD_EXECUTABLE(${NONBOND_TEST} ${TEST_PROG})
-
-        SET_TARGET_PROPERTIES(${NONBOND_TEST} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${NONBOND_DEFINE_STRING}" )
-        ADD_TEST(${NONBOND_TEST} ${EXECUTABLE_OUTPUT_PATH}/${NONBOND_TEST})
-
-        # OBC
-
-        SET(DEFINE_STRING "${DEFINE_STRING} -DIMPLICIT_SOLVENT=1")
-        SET_TARGET_PROPERTIES(${TEST_ROOT} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS}" COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${DEFINE_STRING}" )
-
-        IF( INCLUDE_SERIALIZATION )
-            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
-            TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_TARGET} ${SHARED_OPENMM_SERIALIZATION} )
-        ELSE( INCLUDE_SERIALIZATION )
-            TARGET_LINK_LIBRARIES(${NONBOND_TEST} ${SHARED_TARGET})
-        ENDIF( INCLUDE_SERIALIZATION )
-
-    ENDIF( ${TEST_ROOT} STREQUAL "TestOpenCLGBSAOBCForce2" )
     ADD_TEST(${TEST_ROOT}Single ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} single)
     IF (OPENMM_BUILD_OPENCL_DOUBLE_PRECISION_TESTS)
         ADD_TEST(${TEST_ROOT}Mixed ${EXECUTABLE_OUTPUT_PATH}/${TEST_ROOT} mixed)