CTest Environment Update (#756)
* Update test/tools/json-tool.cpp - push/pop ppid as external correlation id instead of pid * Update environment variables for tests and samples * Revert to old CDash dashboard in run-ci.py * Revert to new CDash dashboard in run-ci.py
This commit is contained in:
committed by
GitHub
parent
066e659d6e
commit
3eaa678054
@@ -17,10 +17,8 @@ else()
|
||||
set(LOG_LEVEL "info")
|
||||
endif()
|
||||
|
||||
set(tracing-env
|
||||
"${PRELOAD_ENV}" "ROCPROF_LOG_LEVEL=${LOG_LEVEL}"
|
||||
"ROCPROFILER_LOG_LEVEL=${LOG_LEVEL}"
|
||||
"HSA_TOOLS_LIB=$<TARGET_FILE:rocprofiler::rocprofiler-shared-library>")
|
||||
set(tracing-env "${PRELOAD_ENV}" "ROCPROF_LOG_LEVEL=${LOG_LEVEL}"
|
||||
"ROCPROFILER_LOG_LEVEL=${LOG_LEVEL}")
|
||||
|
||||
foreach(FILENAME validate.py conftest.py)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}
|
||||
|
||||
@@ -21,7 +21,6 @@ add_test(NAME test-scratch-memory-tracing-execute COMMAND $<TARGET_FILE:scratch-
|
||||
|
||||
set(scratch-memory-tracing-env
|
||||
"${PRELOAD_ENV}"
|
||||
"HSA_TOOLS_LIB=$<TARGET_FILE:rocprofiler::rocprofiler-shared-library>"
|
||||
"ROCPROFILER_TOOL_OUTPUT_FILE=scratch-memory-tracing-test.json"
|
||||
"LD_LIBRARY_PATH=$<TARGET_FILE_DIR:rocprofiler::rocprofiler-shared-library>:$ENV{LD_LIBRARY_PATH}"
|
||||
)
|
||||
|
||||
@@ -1343,7 +1343,7 @@ tool_init(rocprofiler_client_finalize_t fini_func, void* tool_data)
|
||||
}
|
||||
}
|
||||
|
||||
push_external_correlation(getpid());
|
||||
push_external_correlation(getppid());
|
||||
|
||||
start();
|
||||
|
||||
@@ -1910,13 +1910,13 @@ pop_external_correlation()
|
||||
auto _data = rocprofiler_user_data_t{.value = 0};
|
||||
ROCPROFILER_CALL(rocprofiler_pop_external_correlation_id(*itr.second, tid, &_data),
|
||||
"push external correlation");
|
||||
if(_data.value != static_cast<uint64_t>(getpid()))
|
||||
if(_data.value != static_cast<uint64_t>(getppid()))
|
||||
{
|
||||
auto _msg = std::stringstream{};
|
||||
_msg << "rocprofiler_pop_external_correlation_id(context.handle="
|
||||
<< itr.second->handle << ", tid=" << tid
|
||||
<< ", ...) returned external correlation id value of " << _data.value
|
||||
<< ". expected: " << getpid();
|
||||
<< ". expected: " << getppid();
|
||||
throw std::runtime_error{_msg.str()};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user