jdanekrh commented on issue #207: PROTON-2135 Set TEST_ENV more consistently URL: https://github.com/apache/qpid-proton/pull/207#issuecomment-575092712 What I have currently in mind is something like this. Hopefully it will work well for other tests besides ruby. ```diff +include(CMakeParseArguments) + +function(pn_add_test) + set(options EXECUTABLE INTERPRETED UNWRAPPED IGNORE_ENVIRONMENT) + set(oneValueArgs NAME COMMAND) + set(multiValueArgs PREPEND_ENVIRONMENT APPEND_ENVIRONMENT) + cmake_parse_arguments(pn_add_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + if (pn_add_test_IGNORE_ENVIRONMENT) + set (ignore_environment "--ignore_environment") + else(pn_add_test_IGNORE_ENVIRONMENT) + set (ignore_environment "") + endif(pn_add_test_IGNORE_ENVIRONMENT) + + if (pn_add_test_UNWRAPPED) + set (wrapper "") + elseif(pn_add_test_INTERPRETED) + set (wrapper "${TEST_WRAP_PREFIX_CMD}") + elseif(pn_add_test_EXECUTABLE) + set (wrapper "${TEST_EXE_PREFIX_CMD}") + else() + message(FATAL_ERROR "pn_add_test requires one of EXECUTABLE INTERPRETED UNWRAPPED") + endif() + + add_test ( + NAME ${pn_add_test_NAME} + COMMAND ${PN_ENV_SCRIPT} ${ignore_environment} -- ${pn_add_test_PREPEND_ENVIRONMENT} ${TEST_ENV} ${pn_add_test_APPEND_ENVIRONMENT} ${wrapper} ${pn_add_test_COMMAND} + ${pn_add_test_UNPARSED_ARGUMENTS} + ) +endfunction(pn_add_test) + execute_process(COMMAND ${RUBY_EXECUTABLE} -r minitest -e "" RESULT_VARIABLE result OUTPUT_QUIET ERROR_QUIET) if (result EQUAL 0) # Have minitest - set(test_env + set(ruby_test_env "PATH=${PATH}" "RUBYLIB=${RUBYLIB}" - "SASLPASSWD=${CyrusSASL_Saslpasswd_EXECUTABLE}" - ${TEST_ENV}) + "SASLPASSWD=${CyrusSASL_Saslpasswd_EXECUTABLE}") macro(add_ruby_test script) get_filename_component(name ${script} NAME_WE) string(REPLACE "_" "-" name "ruby-${name}") - add_test( + pn_add_test( + INTERPRETED NAME ${name} - COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${TEST_WRAP_PREFIX_CMD} ${RUBY_EXECUTABLE} ${script} -v + PREPEND_ENVIRONMENT ${ruby_test_env} + COMMAND ${RUBY_EXECUTABLE} ${script} -v ${ARGN}) endmacro() - add_test( + pn_add_test( + UNWRAPPED NAME ruby-example-test - COMMAND ${PN_ENV_SCRIPT} -- ${test_env} ${RUBY_EXECUTABLE} testme -v + PREPEND_ENVIRONMENT ${ruby_test_env} + COMMAND ${RUBY_EXECUTABLE} testme -v WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples) ```
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@qpid.apache.org For additional commands, e-mail: dev-h...@qpid.apache.org
