Restrict tests requiring NOX

diff --git a/tests/numerics/nonlinear_solver_selector_01.cc b/tests/numerics/nonlinear_solver_selector_01.cc
index f858e0f4c0d405dcee9e41b0e1abc0f0cdffcb3b..05252a98a1b1bee5ae1e7460b42c130cf2d9ff0d 100644 (file)
--- a/tests/numerics/nonlinear_solver_selector_01.cc
+++ b/tests/numerics/nonlinear_solver_selector_01.cc
@@ -51,7 +51,7 @@
 #ifdef DEAL_II_WITH_SUNDIALS
 #  include <deal.II/sundials/kinsol.h>
 #endif
-#ifdef DEAL_II_WITH_TRILINOS
+#ifdef DEAL_II_TRILINOS_WITH_NOX
 #  include <deal.II/trilinos/nox.h>
 #endif
 

diff --git a/tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos=on.output b/tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos_with_nox=on.output
similarity index 100%
rename from tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos=on.output
rename to tests/numerics/nonlinear_solver_selector_01_nox.with_trilinos_with_nox=on.output

diff --git a/tests/numerics/nonlinear_solver_selector_03.cc b/tests/numerics/nonlinear_solver_selector_03.cc
index 51c2dfc4be8d08bd6bf5399788695f1a62ba76f5..bc2c6b752aeede5233ded445f416ecb09fc9e675 100644 (file)
--- a/tests/numerics/nonlinear_solver_selector_03.cc
+++ b/tests/numerics/nonlinear_solver_selector_03.cc
@@ -29,13 +29,13 @@
 namespace LA
 {
 #if defined(DEAL_II_WITH_PETSC) && \
-  (!defined(DEAL_II_WITH_TRILINOS) || defined(FORCE_USE_OF_PETSC))
+  (!defined(DEAL_II_TRILINOS_WITH_NOX) || defined(FORCE_USE_OF_PETSC))
   using namespace dealii::LinearAlgebraPETSc;
 #  define USE_PETSC_LA
-#elif defined(DEAL_II_WITH_TRILINOS)
+#elif defined(DEAL_II_TRILINOS_WITH_NOX)
   using namespace dealii::LinearAlgebraTrilinos;
 #else
-#  error DEAL_II_WITH_PETSC or DEAL_II_WITH_TRILINOS required
+#  error DEAL_II_WITH_PETSC or DEAL_II_TRILINOS_WITH_NOX required
 #endif
 } // namespace LA
 

diff --git a/tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos=on.mpirun=4.output b/tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos_with_nox=on.mpirun=4.output
similarity index 100%
rename from tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos=on.mpirun=4.output
rename to tests/numerics/nonlinear_solver_selector_03_nox.with_trilinos_with_nox=on.mpirun=4.output