gplugin/gplugin

flow: Merged <feature> '51-need-a-way-to-disable-moonscript-tests' to <develop> ('develop').
develop
2015-05-31, Gary Kramlich
afb73f953c25
Parents 4e5dc8c1175dee82313fdbd3
Children fe9bfd790c9a
flow: Merged '51-need-a-way-to-disable-moonscript-tests' to ('develop').
3 files changed, 11 insertions(+), 2 deletions(-)
  • +2 -0
    ChangeLog
  • +5 -0
    lua/CMakeLists.txt
  • +4 -2
    lua/tests/CMakeLists.txt
    • --- a/ChangeLog Tue May 19 00:33:33 2015 -0500
    +++ b/ChangeLog Sun May 31 14:13:50 2015 -0500
    @@ -3,6 +3,8 @@
    locations. - Elliott Sales de Andrade
    * Added -L, --list option to gplugin-query to show the search paths it is
    using.
    + * Added an option to toggle whether or not the moonscript tests are run.
    + Defaults to no.
    0.0.20: 2015/05/07
    * Fixed the lua dependency checks for Fedora 20
    --- a/lua/CMakeLists.txt Tue May 19 00:33:33 2015 -0500
    +++ b/lua/CMakeLists.txt Sun May 31 14:13:50 2015 -0500
    @@ -62,6 +62,11 @@
    message(FATAL_ERROR " failed to find the 'lgi' lua module")
    endif(${LUA_LGI_FOUND} EQUAL 0)
    + option(
    + MOONSCRIPT_TESTS
    + "Whether or not to run the moonscript tests"
    + "Off"
    + )
    # now add the library
    add_library(gplugin-lua MODULE
    --- a/lua/tests/CMakeLists.txt Tue May 19 00:33:33 2015 -0500
    +++ b/lua/tests/CMakeLists.txt Sun May 31 14:13:50 2015 -0500
    @@ -23,8 +23,10 @@
    add_lua_gtest(test-lua-loader)
    target_link_libraries(test-lua-loader gplugin-loader-tests)
    -add_lua_gtest(test-lua-moon-loader)
    -target_link_libraries(test-lua-moon-loader gplugin-loader-tests)
    +if(${MOONSCRIPT_TESTS})
    + add_lua_gtest(test-lua-moon-loader)
    + target_link_libraries(test-lua-moon-loader gplugin-loader-tests)
    +endif(${MOONSCRIPT_TESTS})
    set(GTESTER_LUA_TESTS "${LUA_TESTS}")
    set(GTESTER_LUA_LOG "test-gplugin-lua.xml")