From 635ceccea6922ad75c62704819bb74ac68b7b629 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Tue, 8 Nov 2005 17:59:58 -0500
Subject: [PATCH] ENH: Add test for output regular expression
---
CMakeLists.txt | 6 ++++--
testRegistry.cxx | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05af8d87..7dd85c25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -650,11 +650,13 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
ADD_TEST(kwsys.testProcess-7 ${EXEC_DIR}/testProcess 7)
ADD_TEST(kwsys.testHashSTL ${EXEC_DIR}/testHashSTL)
ADD_TEST(kwsys.testRegistry ${EXEC_DIR}/testRegistry)
- IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
+ IF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE)
ADD_TEST(kwsys.testFail ${EXEC_DIR}/testFail)
SET_TESTS_PROPERTIES(kwsys.testFail PROPERTIES WILL_FAIL ON)
GET_TEST_PROPERTY(kwsys.testFail WILL_FAIL wfv)
+ SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES ERROR_REGULAR_EXPRESSION "ERROR\$;FAIL;Test failed")
+ SET_TESTS_PROPERTIES(kwsys.testRegistry PROPERTIES REQUIRED_REGULAR_EXPRESSION "Test passed")
MESSAGE(STATUS "GET_TEST_PROPERTY returned: ${wfv}")
- ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY)
+ ENDIF(COMMAND SET_TESTS_PROPERTIES AND COMMAND GET_TEST_PROPERTY AND KWSYS_STANDALONE)
ENDIF(BUILD_TESTING)
ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
diff --git a/testRegistry.cxx b/testRegistry.cxx
index e0335082..6b06e1ea 100644
--- a/testRegistry.cxx
+++ b/testRegistry.cxx
@@ -103,5 +103,9 @@ int main(int, char**)
{
kwsys_ios::cout << "Test failed" << kwsys_ios::endl;
}
+ else
+ {
+ kwsys_ios::cout << "Test passed" << kwsys_ios::endl;
+ }
return res;
}
--
GitLab