Wireshark-commits: [Wireshark-commits] master-2.6 abd3845: Lua: Fix our test global config path.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 04 May 2018 18:25:24 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=abd3845adca0ac4e2bab195eff8a71d769633151
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

abd3845 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Lua: Fix our test global config path.
    
    Fixup the order of our "Running in build directory" filename components.
    This should fix the
    
    tshark: Lua: Error during loading:
     [string "/home/wireshark/builders/wireshark-2.6/ubuntu..."]:700: bad argument #1 to 'dofile' (dofile: file does not exist)
    
    errors that we're seeing on the Ubuntu 2.6 builder.
    
    Note that WSLUA_ARG_ERROR appears to truncate strings.
    
    Change-Id: Ie7e6ed7b9b11c5b06136033d20080c3a3c68b54d
    Reviewed-on: https://code.wireshark.org/review/27331
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  83cb5ad   CMake: check for /Qspectre before using it
    adds  abd3845   Lua: Fix our test global config path.


Summary of changes:
 epan/wslua/wslua.h     | 4 ++++
 epan/wslua/wslua_dir.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)