diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-09-23 10:11:35 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2011-09-23 10:11:35 +0000 |
commit | 1f7c50ca03b975a4adf278d85c6228d1a792748b (patch) | |
tree | 13040b8ccd4d5bdc3d9065b49413b5a8f90aa045 /CMakeLists.txt | |
parent | 4e19e57fe86d77826eb14db6bb3d9c5b1cf41237 (diff) | |
download | pcre-1f7c50ca03b975a4adf278d85c6228d1a792748b.tar.gz |
RunTest uses Windows files for "fr" locale and looks for testdata in parent
directory. CMakeLists.txt uses RunTest for testing in msys environment.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@706 2f5784b3-3f2a-0410-8824-cb99058d5e15
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b1014a..aeed161 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -487,12 +487,18 @@ IF(PCRE_BUILD_TESTS) ") IF(UNIX) - ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest) - ADD_TEST(pcre_grep_test ${PROJECT_SOURCE_DIR}/RunGrepTest) + ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest) + ADD_TEST(pcre_grep_test ${PROJECT_SOURCE_DIR}/RunGrepTest) ENDIF(UNIX) + IF(WIN32) - # ADD_TEST(pcre_test cmd /C ${PROJECT_SOURCE_DIR}/RunTest.bat) - ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest.bat) + IF("$ENV{OSTYPE}" STREQUAL "msys") + ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest) + ADD_TEST(pcre_grep_test ${PROJECT_SOURCE_DIR}/RunGrepTest) + ELSE("$ENV{OSTYPE}" STREQUAL "msys") + # ADD_TEST(pcre_test cmd /C ${PROJECT_SOURCE_DIR}/RunTest.bat) + ADD_TEST(pcre_test ${PROJECT_SOURCE_DIR}/RunTest.bat) + ENDIF("$ENV{OSTYPE}" STREQUAL "msys") ENDIF(WIN32) IF(PCRE_SUPPORT_JIT) @@ -514,8 +520,9 @@ IF(PCRE_BUILD_TESTS) DEBUG_LOCATION) IF(PCRE_SUPPORT_JIT) - ADD_TEST(pcre_jit_test ${PCRE_JIT_TEST_EXE}) + ADD_TEST(pcre_jit_test ${PCRE_JIT_TEST_EXE}) ENDIF(PCRE_SUPPORT_JIT) + ADD_TEST(pcrecpp_test ${PCRECPP_UNITTEST_EXE}) ADD_TEST(pcre_scanner_test ${PCRE_SCANNER_UNITTEST_EXE}) ADD_TEST(pcre_stringpiece_test ${PCRE_STRINGPIECE_UNITTEST_EXE}) |