From dae08c371fdda0972eb1b64db0d2a07951b2aa3e Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Mon, 21 Apr 2014 19:18:42 +0200 Subject: [PATCH] Cmake tests: Allow regular expressions to select for reverted tests. --- development/autotests/CMakeLists.txt | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt index 6c438ca2bb..9a6e6c4e8c 100644 --- 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) -- 2.39.2