This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new b439105378 autest target: PYTHONPATH for remap_acl.test.py (#11788)
b439105378 is described below
commit b439105378afe1e2cba067dde802a694816527bf
Author: Brian Neradt <[email protected]>
AuthorDate: Tue Sep 24 17:52:52 2024 -0500
autest target: PYTHONPATH for remap_acl.test.py (#11788)
The autest.sh has updates for the PYTHONPATH to find the
deactivate_ip_allow.py and all_acl_combinations.py files, but the cmake
targets were not updated for these. This updates the cmake targets to
set the PYTHONPATH to find these files.
---
tests/CMakeLists.txt | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 481a57c5b4..332c978675 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -54,9 +54,11 @@ add_custom_target(
autest
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install
COMMAND ${RUNPIPENV} install
- COMMAND ${RUNPIPENV} run env autest --directory
${CMAKE_CURRENT_SOURCE_DIR}/gold_tests
- --ats-bin=${CMAKE_INSTALL_PREFIX}/bin --proxy-verifier-bin
${PROXY_VERIFIER_PATH} --build-root
- ${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX} ${AUTEST_OPTIONS}
+ COMMAND
+ ${CMAKE_COMMAND} -E env
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/remap:$ENV{PYTHONPATH}
${RUNPIPENV} run
+ env autest --directory ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests
--ats-bin=${CMAKE_INSTALL_PREFIX}/bin
+ --proxy-verifier-bin ${PROXY_VERIFIER_PATH} --build-root
${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX}
+ ${AUTEST_OPTIONS}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
USES_TERMINAL
)
@@ -64,9 +66,11 @@ add_custom_target(
add_custom_target(
autest_no_install
COMMAND ${RUNPIPENV} install
- COMMAND ${RUNPIPENV} run env autest --directory
${CMAKE_CURRENT_SOURCE_DIR}/gold_tests
- --ats-bin=${CMAKE_INSTALL_PREFIX}/bin --proxy-verifier-bin
${PROXY_VERIFIER_PATH} --build-root
- ${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX} ${AUTEST_OPTIONS}
+ COMMAND
+ ${CMAKE_COMMAND} -E env
PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/remap:$ENV{PYTHONPATH}
${RUNPIPENV} run
+ env autest --directory ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests
--ats-bin=${CMAKE_INSTALL_PREFIX}/bin
+ --proxy-verifier-bin ${PROXY_VERIFIER_PATH} --build-root
${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX}
+ ${AUTEST_OPTIONS}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
USES_TERMINAL
)
