Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / energyanalysis / tests / legacyenergy.cpp

diff --git a/src/gromacs/energyanalysis/tests/legacyenergy.cpp b/src/gromacs/energyanalysis/tests/legacyenergy.cpp
index dc2d6217ce4e84d41f3872b974c158d2fed19df9..b8a4edf43db7ec48d9daa4c3150669193cc8262e 100644 (file)
--- a/src/gromacs/energyanalysis/tests/legacyenergy.cpp
+++ b/src/gromacs/energyanalysis/tests/legacyenergy.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2017, by the GROMACS development team, led by
+ * Copyright (c) 2017,2018, 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.
@@ -133,6 +133,11 @@ class EnergyTest : public CommandLineTestBase
             stdioHelper.redirectStringToStdin(stringForStdin);
             ASSERT_EQ(0, gmx_energy(cmdline.argc(), cmdline.argv()));
 
+            // All the .edr files used in the tests contain only
+            // single-precision values, so even from a
+            // double-precision build they should conform to
+            // tolerances suitable for single-precision values.
+            setDefaultTolerance(defaultFloatTolerance());
             checkOutputFiles();
         }
 };