Allow runAsMainSingleModule to be called more than once

[alexxy/gromacs.git] / src / testutils / testoptions.cpp

diff --git a/src/testutils/testoptions.cpp b/src/testutils/testoptions.cpp
index 591c16bc9095366635de7d45fe64d4e5ad5076b9..77f49b9dd1bf8df1cb7e469f4152a02147a65d8b 100644 (file)
--- a/src/testutils/testoptions.cpp
+++ b/src/testutils/testoptions.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -39,6 +39,8 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "testoptions.h"
 
 #include <cstdio>
@@ -48,10 +50,11 @@
 
 #include <gmock/gmock.h>
 
-#include "gromacs/legacyheaders/thread_mpi/mutex.h"
+#include "thread_mpi/mutex.h"
 
 #include "gromacs/commandline/cmdlinehelpcontext.h"
 #include "gromacs/commandline/cmdlinehelpwriter.h"
+#include "gromacs/commandline/cmdlineinit.h"
 #include "gromacs/commandline/cmdlineparser.h"
 #include "gromacs/options/basicoptions.h"
 #include "gromacs/options/options.h"
@@ -59,10 +62,11 @@
 #include "gromacs/utility/errorcodes.h"
 #include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/file.h"
-#include "gromacs/utility/init.h"
+#include "gromacs/utility/programcontext.h"
 
-#include "refdata.h"
-#include "testfilemanager.h"
+#include "testutils/mpi-printer.h"
+#include "testutils/refdata.h"
+#include "testutils/testfilemanager.h"
 
 namespace gmx
 {
@@ -72,21 +76,8 @@ namespace test
 namespace
 {
 
-/*! \internal \brief
- * Global test environment for freeing up libxml2 internal buffers.
- */
-class GromacsTestEnvironment : public ::testing::Environment
-{
-    public:
-        //! Calls MPI_Finalize() if necessary.
-        virtual void TearDown()
-        {
-            gmx::finalize();
-        }
-};
-
 /*! \brief
- * Singleton registry for test options added with GMX_TEST_OPTIONS.
+ * Singleton registry for test options added with #GMX_TEST_OPTIONS.
  *
  * \ingroup module_testutils
  */
@@ -140,7 +131,8 @@ void printHelp(const Options &options)
                  "\nYou can use the following GROMACS-specific command-line flags\n"
                  "to control the behavior of the tests:\n\n");
     CommandLineHelpContext context(&File::standardError(),
-                                   eHelpOutputFormat_Console);
+                                   eHelpOutputFormat_Console, NULL);
+    context.setModuleDisplayName(getProgramContext().displayName());
     CommandLineHelpWriter(options).writeHelp(context);
 }
 
@@ -151,16 +143,20 @@ void registerTestOptions(const char *name, TestOptionsProvider *provider)
     TestOptionsRegistry::getInstance().add(name, provider);
 }
 
-void initTestUtils(const char *dataPath, int *argc, char ***argv)
+void initTestUtils(const char *dataPath, const char *tempPath, int *argc, char ***argv)
 {
+    gmx::initForCommandLine(argc, argv);
     try
     {
-        gmx::init(argc, argv);
         ::testing::InitGoogleMock(argc, *argv);
         if (dataPath != NULL)
         {
             TestFileManager::setInputDataDirectory(dataPath);
         }
+        if (tempPath != NULL)
+        {
+            TestFileManager::setGlobalOutputTempDirectory(tempPath);
+        }
         bool    bHelp = false;
         Options options(NULL, NULL);
         // TODO: A single option that accepts multiple names would be nicer.
@@ -188,14 +184,19 @@ void initTestUtils(const char *dataPath, int *argc, char ***argv)
             printHelp(options);
         }
         setFatalErrorHandler(NULL);
-        ::testing::AddGlobalTestEnvironment(new GromacsTestEnvironment);
+        initMPIOutput();
     }
     catch (const std::exception &ex)
     {
         printFatalErrorMessage(stderr, ex);
-        std::exit(processExceptionAtExit(ex));
+        std::exit(processExceptionAtExitForCommandLine(ex));
     }
 }
 
+void finalizeTestUtils()
+{
+    gmx::finalizeForCommandLine();
+}
+
 } // namespace test
 } // namespace gmx