From 03c0fe38b4928940d3c92822e6bd6a4feb42d842 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Tue, 25 Aug 2015 22:45:41 -0500 Subject: [PATCH] Documentation: Update to reflect changes in version constraint handling --- doc/developers/testsuite.html | 43 ++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/doc/developers/testsuite.html b/doc/developers/testsuite.html index 2b97c0dd3e..8900d8ba2f 100644 --- a/doc/developers/testsuite.html +++ b/doc/developers/testsuite.html @@ -424,9 +424,11 @@ category/test.output

Comparison file can actually be named in a more complex way than - just category/test.output: + just category/test.output. In pseudo code: 

-category/test.[compiler=<regex>=<yes|no>.]*[with_<feature>=<on|off|<version>>.]*[mpirun=<x>.][expect=<y>.][binary.][<debug|release>.]output
+category/test.[compiler=<string>(<=|>=|=|<|>)<yes|no|version>.]*
+              [with_<string>(<=|>=|=|<|>)<on|off|version>.]*
+              [mpirun=<x>.][expect=<y>.][binary.][<debug|release>.]output
Normally, a test will be set up so that it runs twice, once in debug and once in release configuration. @@ -455,14 +457,22 @@ category/test.release.output tests to specific compiler versions, e.g.: 
 category/test.compiler=GNU=yes.output, or
-category/test.compiler=ICC-14=no.output
+category/test.compiler=GNU=no.output, or
+category/test.compiler=Intel>=15.0.3.output
- These tests will only be set up if the specified regular expression - matches (in case of =yes), or doesn't match - (=no) the string - ${CMAKE_CXX_COMPILER_ID}-${CMAKE_CXX_COMPILER_VERSION}. - Common compiler names are GNU, Clang or - Intel. + The first test will only be set up if the specified compiler string + (in this case GNU) is equal to the string + ${CMAKE_CXX_COMPILER_ID}. Similarly, the second test + will be set up if both strings are different. Common compiler names + are GNU, Clang, or Intel. +

+

+ The third declaration is an example of how to specify a version + constraint: This tets will be set up if deal.II is configured with + the Intel compiler version 15.0.3 or higher. The operators + =, <, >, <=, + >= are supported. +

Restricting tests to feature configurations

@@ -480,14 +490,16 @@ category/test.with_zlib=off.output category/test.with_64bit_indices=on.output category/test.with_64bit_indices=off.output - Furthermore, a test can be restricted to be run only for a specific - minimum version of a feature being available being available. For example + Furthermore, a test can be restricted to be run only if specific + versions of a feature are available. For example 
-category/test.with_trilinos=11.14.1.output
+category/test.with_trilinos>=11.14.1.output
will only be run if (a) trilinos is available, i.e., DEAL_II_WITH_TRILINOS=TRUE and (b) if trilinos is at least - of version 11.14.1. + of version 11.14.1. Similarly, the operators + =, <, >, <=, + >= are supported.

It is also possible to declare multiple constraints subsequently, e.g. @@ -498,9 +510,8 @@ category/test.with_umfpack=on.with_zlib=on.output

Note: The tests in some subdirectories of tests/ are automatically run only if some feature is enabled. In this case a - feature constraint encoded in the output file name is - redundant and should be avoided. In particular, this holds for - subdirectories + feature constraint encoded in the output file name is redundant and + should be avoided. In particular, this holds for subdirectories distributed_grids, lapack, metis, petsc, slepc, trilinos, umfpack, gla, and -- 2.39.5