From: Matthias Maier Date: Thu, 16 Jul 2015 13:47:27 +0000 (-0500) Subject: Bugfix: Do not test for inclusion of config.h in header tests X-Git-Tag: v8.4.0-rc2~753^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1147%2Fhead;p=dealii.git Bugfix: Do not test for inclusion of config.h in header tests It turns out that sometimes [1] the testsuite picks up revision.h (and config.h) as well. revision.h does not include config.h and the test subsequently fails with the DEAL_II_NAMESPACE_* not being found. Disable this check for the revision.h test. [1] For an in-source build and if an installed deal.II is tested. --- diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 08e7a3f3de..532addee6e 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef dealii___config_h -#define dealii___config_h +#ifndef dealii__config_h +#define dealii__config_h /*********************************************************************** diff --git a/include/deal.II/base/revision.h.in b/include/deal.II/base/revision.h.in index 6206295609..7e8cc3747d 100644 --- a/include/deal.II/base/revision.h.in +++ b/include/deal.II/base/revision.h.in @@ -13,8 +13,8 @@ // // --------------------------------------------------------------------- -#ifndef dealii___revision_h -#define dealii___revision_h +#ifndef dealii__revision_h +#define dealii__revision_h /** * Name of the local git branch of the source directory. diff --git a/tests/all-headers/test_header.cc b/tests/all-headers/test_header.cc index 4818f513bb..3cc8ff2ad4 100644 --- a/tests/all-headers/test_header.cc +++ b/tests/all-headers/test_header.cc @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2013 - 2014 by the deal.II authors +// Copyright (C) 2013 - 2015 by the deal.II authors // // This file is part of the deal.II library. // @@ -15,9 +15,10 @@ #include HEADER -// Make sure that config.h is always included: -DEAL_II_NAMESPACE_OPEN -DEAL_II_NAMESPACE_CLOSE +#if !defined(DEAL_II_NAMESPACE_OPEN) && !defined(dealii__revision_h) +#error "HEADER does not include config.h." +#endif + int main() {