From b07ca01a5482534f886aca6d61f084cb4b4a0646 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Mon, 27 Feb 2012 18:15:35 +0000 Subject: [PATCH] Made surfSolver test more reliable with different compilers Compare only the 'results.txt' file instead of what's printed to stdout, which contains numerical residuals that tend to change. --- test_problems/SConscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test_problems/SConscript b/test_problems/SConscript index e064935f6..5af2f4c2e 100644 --- a/test_problems/SConscript +++ b/test_problems/SConscript @@ -281,10 +281,16 @@ CompileAndTest('rankine_democxx', 'rankine_democxx', 'rankine', 'output_blessed. CompileAndTest('silane_equil', 'silane_equil', 'silane_equi', 'output_blessed.txt') # spectroscopy is incomplete CompileAndTest('surfkin', 'surfkin', 'surfdemo', 'output_blessed.txt') -CompileAndTest('surfSolver', 'surfSolverTest', 'surfaceSolver', 'surfaceSolver_blessed.out', +CompileAndTest('surfSolver', 'surfSolverTest', 'surfaceSolver', None, arguments='haca2.xml', + comparisons=[('results_blessed.txt', 'results.txt')], artifacts=['results.txt', 'diamond.xml'], - extensions=['^surfaceSolver.cpp']) # needs .csv, extra tests + extensions=['^surfaceSolver.cpp']) +CompileAndTest('surfSolver2', 'surfSolverTest', 'surfaceSolver2', None, + arguments='haca2.xml', + comparisons=[('results2_blessed.txt', 'results2.txt')], + artifacts=['results2.txt', 'diamond.xml'], + extensions=['^surfaceSolver2.cpp']) CompileAndTest('VCSnonideal', pjoin('VCSnonideal', 'NaCl_equil'), 'nacl_equil', 'good_out.txt', options='-d 3',