Ignore:
Timestamp:
Jun 6, 2017, 6:20:55 PM (23 months ago)
Author:
cameron
Message:

Restore check-ins from the last several days

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/CMakeLists.txt

    r5492 r5493  
    8080add_library(PabloADT ${PABLO_SRC})
    8181add_library(RegExpADT re/re_re.cpp re/re_cc.cpp re/re_rep.cpp re/re_diff.cpp re/re_intersect.cpp re/printer_re.cpp)
    82 add_library(RegExpCompiler re/re_parser.cpp re/re_nullable.cpp re/re_simplifier.cpp re/re_compiler.cpp re/re_analysis.cpp re/re_toolchain.cpp re/re_name_resolve.cpp re/re_parser_pcre.cpp re/re_parser_ere.cpp re/re_parser_bre.cpp re/re_parser_prosite.cpp re/re_utility.cpp)
     82add_library(RegExpCompiler re/re_parser.cpp re/re_nullable.cpp re/re_simplifier.cpp re/re_star_normal.cpp re/re_compiler.cpp re/re_analysis.cpp re/re_toolchain.cpp re/re_name_resolve.cpp re/re_parser_pcre.cpp re/re_parser_ere.cpp re/re_parser_bre.cpp re/re_parser_prosite.cpp re/re_utility.cpp)
    8383add_library(CCADT cc/cc_compiler.cpp utf8_encoder.cpp utf16_encoder.cpp UCD/CaseFolding_txt.cpp cc/alphabet.cpp cc/multiplex_CCs.cpp)
    8484add_library(UCDlib UCD/unicode_set.cpp UCD/ucd_compiler.cpp UCD/PropertyObjects.cpp UCD/resolve_properties.cpp UCD/UnicodeNameData.cpp)
     
    159159SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
    160160
    161 include(CheckFunctionExists)
    162 CHECK_FUNCTION_EXISTS(aligned_alloc STDLIB_HAS_ALIGNED_ALLOC)
    163 IF (STDLIB_HAS_ALIGNED_ALLOC)
    164 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTDLIB_HAS_ALIGNED_ALLOC")
     161UNSET(HAS_EXECINFO CACHE)
     162UNSET(HAS_MACH_VM_TYPES CACHE)
     163include(CheckIncludeFileCXX)
     164CHECK_INCLUDE_FILE_CXX(mach/vm_types.h HAS_MACH_VM_TYPES)
     165IF (HAS_MACH_VM_TYPES)
     166  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_MACH_VM_TYPES")
    165167ELSE()
    166 CHECK_FUNCTION_EXISTS(posix_memalign STDLIB_HAS_POSIX_MEMALIGN)
    167 IF (!STDLIB_HAS_POSIX_MEMALIGN)
    168 MESSAGE(FATAL_ERROR "stdlib.h does not contain either aligned_alloc or posix_memalign" )
    169 ENDIF()
    170 ENDIF()
    171 
    172 include(CheckIncludeFileCXX)
    173 find_package(Libunwind)
    174 IF (LIBUNWIND_FOUND)
    175 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_LIBUNWIND")
    176 include_directories(${LIBUNWIND_INCLUDE_DIR})
    177 target_link_libraries(CodeGen ${LIBUNWIND_LIBRARIES})
    178 ELSE()
    179 CHECK_INCLUDE_FILE_CXX(execinfo.h HAS_EXECINFO)
    180 IF (HAS_EXECINFO)
    181 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_EXECINFO")
    182 ENDIF()
     168  UNSET(LIBUNWIND_FOUND CACHE)
     169  find_package(Libunwind)
     170  IF (LIBUNWIND_FOUND)
     171    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_LIBUNWIND")
     172    include_directories(${LIBUNWIND_INCLUDE_DIR})
     173    target_link_libraries(CodeGen ${LIBUNWIND_LIBRARIES})
     174  ELSE()
     175    CHECK_INCLUDE_FILE_CXX(execinfo.h HAS_EXECINFO)
     176    IF (HAS_EXECINFO)
     177       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAS_EXECINFO")
     178    ENDIF()
     179  ENDIF()
    183180ENDIF()
    184181
     
    202199SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
    203200
    204 CHECK_INCLUDE_FILE_CXX(sanitizer/asan_interface.h HAS_ADDRESS_SANITIZER)
     201UNSET(HAS_ADDRESS_SANITIZER)
     202CHECK_INCLUDE_FILE_CXX("sanitizer/asan_interface.h" HAS_ADDRESS_SANITIZER)
    205203IF (HAS_ADDRESS_SANITIZER)
    206204SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DHAS_ADDRESS_SANITIZER -fsanitize=address")
    207205ENDIF()
    208206
    209 
    210207add_test(
    211208  NAME greptest
    212209  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
    213   COMMAND python2 greptest.py ${CMAKE_BINARY_DIR}/icgrep)
     210  COMMAND timeout 1000 python greptest.py ${CMAKE_BINARY_DIR}/icgrep)
    214211
    215212add_test(
    216213  NAME proptest
    217214  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
    218   COMMAND python2 greptest.py -d ${PROJECT_SOURCE_DIR}/../QA -t ${PROJECT_SOURCE_DIR}/../QA/proptest.xml ${CMAKE_BINARY_DIR}/icgrep)
     215  COMMAND timeout 2000 python greptest.py -d ${PROJECT_SOURCE_DIR}/../QA -t ${PROJECT_SOURCE_DIR}/../QA/proptest.xml ${CMAKE_BINARY_DIR}/icgrep)
    219216
    220217add_test(
    221218  NAME abc_test
    222219  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
    223   COMMAND ./run_abc ${CMAKE_BINARY_DIR}/icgrep)
     220  COMMAND timeout 200 ./run_abc ${CMAKE_BINARY_DIR}/icgrep)
    224221
    225222add_test(
    226223  NAME u8u16_test
    227224  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/u8u16
    228   COMMAND ./run_all "${CMAKE_BINARY_DIR}/u8u16 -segment-size=16 -enable-segment-pipeline-parallel")
     225  COMMAND timeout 15 ./run_all "${CMAKE_BINARY_DIR}/u8u16 -segment-size=16 -enable-segment-pipeline-parallel")
    229226
    230227add_test(
    231228  NAME lz4d_test
    232229  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/lz4d
    233   COMMAND ./run_all ${CMAKE_BINARY_DIR}/lz4d)
     230  COMMAND timeout 15 ./run_all ${CMAKE_BINARY_DIR}/lz4d)
    234231
    235232add_test(
    236233  NAME editd_test
    237234  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/editd
    238   COMMAND python run_all.py -e ${CMAKE_BINARY_DIR})
     235  COMMAND timeout 50 python run_all.py -e ${CMAKE_BINARY_DIR})
    239236
    240237add_test(
    241238  NAME base64_test
    242239  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/base64
    243   COMMAND python base64test.py ${CMAKE_BINARY_DIR}/base64)
     240  COMMAND timeout 15 python base64test.py ${CMAKE_BINARY_DIR}/base64)
     241
     242add_custom_target (greptest
     243  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
     244  COMMAND timeout 600 python greptest.py "${CMAKE_BINARY_DIR}/icgrep -ea")
     245
     246add_custom_target (proptest
     247  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
     248  COMMAND timeout 1000 python greptest.py -d ${PROJECT_SOURCE_DIR}/../QA -t ${PROJECT_SOURCE_DIR}/../QA/proptest.xml "${CMAKE_BINARY_DIR}/icgrep -ea")
    244249
    245250add_custom_target (u8u16_test
    246251  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/u8u16
    247   COMMAND ./run_all "${CMAKE_BINARY_DIR}/u8u16 -segment-size=16 -enable-segment-pipeline-parallel")
     252  COMMAND timeout 15 ./run_all "${CMAKE_BINARY_DIR}/u8u16 -ea -segment-size=16 -enable-segment-pipeline-parallel")
    248253
    249254add_custom_target (lz4d_test
    250255  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/lz4d
    251   COMMAND ./run_all ${CMAKE_BINARY_DIR}/lz4d)
     256  COMMAND timeout 15 ./run_all "${CMAKE_BINARY_DIR}/lz4d -ea")
    252257
    253258add_custom_target (editd_test
    254259  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/editd
    255   COMMAND python run_all.py -e ${CMAKE_BINARY_DIR})
     260  COMMAND timeout 50 python run_all.py -e ${CMAKE_BINARY_DIR})
    256261
    257262add_custom_target (base64_test
    258263  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/base64
    259   COMMAND python base64test.py ${CMAKE_BINARY_DIR}/base64)
     264  COMMAND timeout 20 python base64test.py "${CMAKE_BINARY_DIR}/base64 -ea")
    260265
    261266add_custom_target (abc_test
    262   COMMAND python2 abc_testgen.py
    263   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA)
     267  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA
     268  COMMAND timeout 200 ./run_abc "${CMAKE_BINARY_DIR}/icgrep -ea")
    264269
    265270add_custom_target (check
Note: See TracChangeset for help on using the changeset viewer.