Cmake tests: Allow regular expressions to select for reverted tests.

diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index 6c438ca2bb330be492f12ae3f7da0ddc1f11ff83..9a6e6c4e8c19c7446a297795eddc827f294b6512 100644 (file)
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -136,19 +136,24 @@ macro(getoutputformats filepath varname)
   set(${varname} ${out_formats})
 endmacro()
 
-macro(maketestname testname reverted listreverted listignored)
-  set(_idx -1)
-  foreach(_itrx ${${listignored}})
+macro(findexpr found testname listname)
+  set(_found 0)
+  foreach(_itrx ${${listname}})
     set(_itr "^${_itrx}$")
     if(${testname} MATCHES ${_itr})
-      set(_idx 0)
+      set(_found 1)
       break()
     endif()
   endforeach()
-  #list(FIND ${listignored} ${${testname}} _idx)
-  if (${_idx} LESS 0)
+  set(${found} ${_found})
+endmacro()
+  
+macro(maketestname testname reverted listreverted listignored)
+  findexpr(mfound ${testname} ${listignored})
+  if (NOT mfound)
+    findexpr(mfound ${testname} ${listreverted})
     list(FIND ${listreverted} ${${testname}} _idx)
-    if (${_idx} LESS 0)
+    if (NOT mfound)
       set(${reverted} 0)
     else()
       set(${reverted} 1)