From f0fe04b95e154549e14ec4353df3b0405ea5efd5 Mon Sep 17 00:00:00 2001 From: "Madsen, Jonathan" Date: Mon, 30 Jun 2025 15:53:30 -0500 Subject: [PATCH] [CI] Disable other unstable tests (#491) Disable other unstable tests - validation test_validate_counter_collection_pmc1 for conversion script - increase timeout for tests/rocprofv3/pc-sampling execution phase --- tests/rocprofv3/conversion-script/CMakeLists.txt | 9 +++++++-- .../host-trap/exec-mask-manipulation/CMakeLists.txt | 6 +++--- .../host-trap/transpose-multiple-agents/CMakeLists.txt | 6 +++--- .../stochastic/exec-mask-manipulation/CMakeLists.txt | 6 +++--- .../stochastic/transpose-multiple-agents/CMakeLists.txt | 6 +++--- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/tests/rocprofv3/conversion-script/CMakeLists.txt b/tests/rocprofv3/conversion-script/CMakeLists.txt index 939a7f3417..9c5b5bee58 100644 --- a/tests/rocprofv3/conversion-script/CMakeLists.txt +++ b/tests/rocprofv3/conversion-script/CMakeLists.txt @@ -29,6 +29,11 @@ project( VERSION 0.0.0) find_package(rocprofiler-sdk REQUIRED) + +if(ROCPROFILER_DISABLE_UNSTABLE_CTESTS) + set(PYTEST_ARGS -k "not test_validate_counter_collection_pmc1") +endif() + # copy to binary directory rocprofiler_configure_pytest_files(COPY validate.py input.txt conftest.py CONFIG pytest.ini) @@ -83,7 +88,7 @@ foreach(i RANGE 0 ${convert_test_length}) add_test(NAME ${validate_test_name} COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py - --input ${output} --retain-agent-prefix true) + ${PYTEST_ARGS} --input ${output} --retain-agent-prefix true) else() add_test( NAME ${test_name} @@ -95,7 +100,7 @@ foreach(i RANGE 0 ${convert_test_length}) add_test(NAME ${validate_test_name} COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/validate.py - --input ${output} --retain-agent-prefix false) + ${PYTEST_ARGS} --input ${output} --retain-agent-prefix false) endif() set_tests_properties( ${test_name} diff --git a/tests/rocprofv3/pc-sampling/host-trap/exec-mask-manipulation/CMakeLists.txt b/tests/rocprofv3/pc-sampling/host-trap/exec-mask-manipulation/CMakeLists.txt index aa164ee493..bec59ac45f 100644 --- a/tests/rocprofv3/pc-sampling/host-trap/exec-mask-manipulation/CMakeLists.txt +++ b/tests/rocprofv3/pc-sampling/host-trap/exec-mask-manipulation/CMakeLists.txt @@ -32,7 +32,7 @@ set(pc-sampling-env-host-trap-exec-mask-manipulation "${PRELOAD_ENV}") set_tests_properties( rocprofv3-test-pc-sampling-host-trap-exec-mask-manipulation-input-cmd-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT @@ -55,7 +55,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-host-trap-exec-mask-manipulation-input-json-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT @@ -78,7 +78,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-host-trap-exec-mask-manipulation-input-yaml-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT diff --git a/tests/rocprofv3/pc-sampling/host-trap/transpose-multiple-agents/CMakeLists.txt b/tests/rocprofv3/pc-sampling/host-trap/transpose-multiple-agents/CMakeLists.txt index b4ce29e8b3..6851871ca5 100644 --- a/tests/rocprofv3/pc-sampling/host-trap/transpose-multiple-agents/CMakeLists.txt +++ b/tests/rocprofv3/pc-sampling/host-trap/transpose-multiple-agents/CMakeLists.txt @@ -38,7 +38,7 @@ set(pc-sampling-env-host-trap-transpose-multiple-agents "${PRELOAD_ENV}") set_tests_properties( rocprofv3-test-pc-sampling-host-trap-transpose-multiple-agents-input-cmd-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT @@ -61,7 +61,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-host-trap-transpose-multiple-agents-input-json-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT @@ -84,7 +84,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-host-trap-transpose-multiple-agents-input-yaml-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling" ENVIRONMENT diff --git a/tests/rocprofv3/pc-sampling/stochastic/exec-mask-manipulation/CMakeLists.txt b/tests/rocprofv3/pc-sampling/stochastic/exec-mask-manipulation/CMakeLists.txt index b92d0beeec..8a0d9ebfca 100644 --- a/tests/rocprofv3/pc-sampling/stochastic/exec-mask-manipulation/CMakeLists.txt +++ b/tests/rocprofv3/pc-sampling/stochastic/exec-mask-manipulation/CMakeLists.txt @@ -54,7 +54,7 @@ set(pc-sampling-env-stochastic-exec-mask-manipulation "${PRELOAD_ENV}") set_tests_properties( rocprofv3-test-pc-sampling-stochastic-exec-mask-manipulation-input-cmd-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT @@ -77,7 +77,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-stochastic-exec-mask-manipulation-input-json-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT @@ -100,7 +100,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-stochastic-exec-mask-manipulation-input-yaml-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT diff --git a/tests/rocprofv3/pc-sampling/stochastic/transpose-multiple-agents/CMakeLists.txt b/tests/rocprofv3/pc-sampling/stochastic/transpose-multiple-agents/CMakeLists.txt index 869aab6fcc..ca88e6567a 100644 --- a/tests/rocprofv3/pc-sampling/stochastic/transpose-multiple-agents/CMakeLists.txt +++ b/tests/rocprofv3/pc-sampling/stochastic/transpose-multiple-agents/CMakeLists.txt @@ -60,7 +60,7 @@ set(pc-sampling-env-stochastic-transpose-multiple-agents "${PRELOAD_ENV}") set_tests_properties( rocprofv3-test-pc-sampling-stochastic-transpose-multiple-agents-input-cmd-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT @@ -83,7 +83,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-stochastic-transpose-multiple-agents-input-json-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT @@ -106,7 +106,7 @@ add_test( set_tests_properties( rocprofv3-test-pc-sampling-stochastic-transpose-multiple-agents-input-yaml-execute PROPERTIES TIMEOUT - 45 + 90 LABELS "integration-tests;pc-sampling;stochastic" ENVIRONMENT