Removed unnecessary calls to load plugins that produced errors

plugins/amoeba/serialization/tests/TestSerializeAmoebaAngleForce.cpp

@@ -80,7 +80,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaBondForce.cpp

@@ -75,7 +75,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaGeneralizedKirkwoodForce.cpp

@@ -94,7 +94,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaInPlaneAngleForce.cpp

@@ -85,7 +85,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaMultipoleForce.cpp

@@ -186,7 +186,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaOutOfPlaneBendForce.cpp

@@ -84,7 +84,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaPiTorsionForce.cpp

@@ -74,7 +74,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaStretchBendForce.cpp

@@ -79,7 +79,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaTorsionTorsionForce.cpp

@@ -133,7 +133,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaVdwForce.cpp

@@ -120,7 +120,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/amoeba/serialization/tests/TestSerializeAmoebaWcaDispersionForce.cpp

@@ -99,7 +99,6 @@ void testSerialization() {
 
 int main() {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
         testSerialization();
     }
     catch(const exception& e) {

plugins/rpmd/platforms/opencl/src/OpenCLRpmdKernelFactory.cpp

@@ -48,6 +48,16 @@ extern "C" void registerKernelFactories() {
     }
 }
 
+extern "C" OPENMM_EXPORT void registerRPMDOpenCLKernelFactories() {
+    try {
+        Platform::getPlatformByName("OpenCL");
+    }
+    catch (...) {
+        Platform::registerPlatform(new OpenCLPlatform());
+    }
+    registerKernelFactories();
+}
+
 KernelImpl* OpenCLRpmdKernelFactory::createKernelImpl(std::string name, const Platform& platform, ContextImpl& context) const {
     OpenCLContext& cl = *static_cast<OpenCLPlatform::PlatformData*>(context.getPlatformData())->contexts[0];
     if (name == IntegrateRPMDStepKernel::Name())

plugins/rpmd/platforms/opencl/tests/CMakeLists.txt

@@ -13,7 +13,7 @@ FOREACH(TEST_PROG ${TEST_PROGS})
 
     # Link with shared library
     ADD_EXECUTABLE(${TEST_ROOT} ${TEST_PROG})
-    TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_RPMD_TARGET})
+    TARGET_LINK_LIBRARIES(${TEST_ROOT} ${SHARED_RPMD_TARGET} ${SHARED_TARGET})
     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)

plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp

@@ -48,6 +48,8 @@
 using namespace OpenMM;
 using namespace std;
 
+extern "C" OPENMM_EXPORT void registerRPMDOpenCLKernelFactories();
+
 void testFreeParticles() {
     const int numParticles = 100;
     const int numCopies = 30;
@@ -223,7 +225,7 @@ void testParaHydrogen() {
 
 int main(int argc, char* argv[]) {
     try {
-        Platform::loadPluginsFromDirectory(Platform::getDefaultPluginsDirectory());
+        registerRPMDOpenCLKernelFactories();
         if (argc > 1)
             Platform::getPlatformByName("OpenCL").setPropertyDefaultValue("OpenCLPrecision", string(argv[1]));
         testFreeParticles();