Sort includes outside src/gromacs

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

diff --git a/src/testutils/integrationtests.cpp b/src/testutils/integrationtests.cpp
index 04668fdda1ab789d84e76ced03f57d5ff3b6f23f..394f5a01ab22d1243d304720b4a9a10e85d1351e 100644 (file)
--- a/src/testutils/integrationtests.cpp
+++ b/src/testutils/integrationtests.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2013, by the GROMACS development team, led by
+ * Copyright (c) 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.
@@ -39,16 +39,22 @@
  * \author Mark Abraham <mark.j.abraham@gmail.com>
  * \ingroup module_testutils
  */
+#include "gmxpre.h"
+
 #include "integrationtests.h"
 
-#include "testutils/testoptions.h"
-#include "gromacs/utility/stringutil.h"
-#include "gromacs/utility/exceptions.h"
-#include "gromacs/options/options.h"
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "gromacs/options/basicoptions.h"
+#include "gromacs/options/options.h"
+#include "gromacs/utility/exceptions.h"
 #include "gromacs/utility/file.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include "gromacs/utility/stringutil.h"
+
+#include "testutils/testoptions.h"
 
 namespace gmx
 {
@@ -61,19 +67,21 @@ namespace test
 
 std::string IntegrationTestFixture::s_maxBackup("-1");
 
+//! \cond
 GMX_TEST_OPTIONS(IntegrationTestOptions, options)
 {
     options->addOption(StringOption("max-backup")
                            .store(&IntegrationTestFixture::s_maxBackup)
                            .description("Maximum number of backup files of old test output to write (-1 prevents backups being created)"));
 }
+//! \endcond
 
 IntegrationTestFixture::IntegrationTestFixture()
 {
     // TODO fix this when we have an encapsulation layer for handling
     // environment variables
 #ifdef GMX_NATIVE_WINDOWS
-    _putenv_s("GMX_MAXBACKUP", s_maxBackup.c_str());
+    _putenv(("GMX_MAXBACKUP="+s_maxBackup).c_str());
 #else
     setenv("GMX_MAXBACKUP", s_maxBackup.c_str(), true);
 #endif