From 3f6ffd02c33f19ad01e4335ac3f620e97f58cc35 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Tue, 23 Feb 2016 11:48:03 +0100 Subject: [PATCH] do not run tests/petsc when complex-valued PETSc is used as most of them fail --- cmake/configure/configure_3_petsc.cmake | 1 + tests/petsc/CMakeLists.txt | 2 +- tests/petsc_complex/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/configure/configure_3_petsc.cmake b/cmake/configure/configure_3_petsc.cmake index d4b913370e..df09430c38 100644 --- a/cmake/configure/configure_3_petsc.cmake +++ b/cmake/configure/configure_3_petsc.cmake @@ -138,3 +138,4 @@ ENDMACRO() CONFIGURE_FEATURE(PETSC) +SET(DEAL_II_PETSC_WITH_COMPLEX ${PETSC_WITH_COMPLEX}) diff --git a/tests/petsc/CMakeLists.txt b/tests/petsc/CMakeLists.txt index 3ad3bbefa3..43a224da11 100644 --- a/tests/petsc/CMakeLists.txt +++ b/tests/petsc/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) -IF(DEAL_II_WITH_PETSC) +IF(DEAL_II_WITH_PETSC AND NOT DEAL_II_PETSC_WITH_COMPLEX) DEAL_II_PICKUP_TESTS() ENDIF() diff --git a/tests/petsc_complex/CMakeLists.txt b/tests/petsc_complex/CMakeLists.txt index d8809e062e..3551fc17d0 100644 --- a/tests/petsc_complex/CMakeLists.txt +++ b/tests/petsc_complex/CMakeLists.txt @@ -1,6 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9) INCLUDE(../setup_testsubproject.cmake) PROJECT(testsuite CXX) -IF(DEAL_II_WITH_PETSC AND PETSC_WITH_COMPLEX) +IF(DEAL_II_WITH_PETSC AND DEAL_II_PETSC_WITH_COMPLEX) DEAL_II_PICKUP_TESTS() ENDIF() -- 2.39.5