Wireshark · Wireshark-commits: [Wireshark-commits] master b255d8a: CMake: Update wslua build and test.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b255d8a1a19cb40a9d04f33e483aa18c3e0a38c8
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

b255d8a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Update wslua build and test.
    
    Process wslua/CMakeLists.txt using add_subdirectory instead of
    include. Generate files in the build directory instead of the source
    directory.
    
    Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's
    where init.lua looks for console.lua.
    
    Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We
    presumably want to test our source files and not files which may or
    may not be in the system path.
    
    When we're running from the build directory look for lua scripts in both
    the Autotools and CMake build locations.
    
    Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b
    Reviewed-on: https://code.wireshark.org/review/7590
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  df164df   GSM_A-BCC: dissector for BCC Protocol
    adds  b255d8a   CMake: Update wslua build and test.


Summary of changes:
 CMakeLists.txt            |    8 +--
 epan/CMakeLists.txt       |    5 +-
 epan/wslua/CMakeLists.txt |  144 +++++++++++++++++++++++----------------------
 epan/wslua/init_wslua.c   |    9 ++-
 epan/wslua/wslua_dir.c    |    8 ++-
 epan/wslua/wslua_util.c   |    8 ++-
 test/config.sh            |    4 ++
 test/suite-nameres.sh     |    2 +-
 8 files changed, 109 insertions(+), 79 deletions(-)