Skip to content

Intermittent crash in comhost tests #31830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 1 commit into from
Feb 6, 2020
Merged

Intermittent crash in comhost tests #31830

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions src/installer/corehost/cli/test/nativehost/resolve_component_dependencies_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ namespace
class resolve_component_dependencies_result
{
public:
thread_local static pal::string_t assembly_paths;
thread_local static pal::string_t native_search_paths;
thread_local static pal::string_t resource_search_paths;

resolve_component_dependencies_result()
{
}
Expand All @@ -27,15 +23,29 @@ namespace
const pal::char_t* local_native_search_paths,
const pal::char_t* local_resource_search_paths)
{
assembly_paths = local_assembly_paths;
native_search_paths = local_native_search_paths;
resource_search_paths = local_resource_search_paths;
assembly_paths() = local_assembly_paths;
native_search_paths() = local_native_search_paths;
resource_search_paths() = local_resource_search_paths;
}

static pal::string_t& assembly_paths()
{
thread_local static pal::string_t assembly_paths;
return assembly_paths;
}
};

thread_local pal::string_t resolve_component_dependencies_result::assembly_paths;
thread_local pal::string_t resolve_component_dependencies_result::native_search_paths;
thread_local pal::string_t resolve_component_dependencies_result::resource_search_paths;
static pal::string_t& native_search_paths()
{
thread_local static pal::string_t native_search_paths;
return native_search_paths;
}

static pal::string_t& resource_search_paths()
{
thread_local static pal::string_t resource_search_paths;
return resource_search_paths;
}
};

template<typename Act>
bool run_app_and_hostpolicy_action(
Expand Down Expand Up @@ -94,7 +104,7 @@ namespace
if (rc == StatusCode::Success)
{
// Split order and merge again the assembly_paths - the result returned by the hostpolicy is not stable (and not guaranteed to be either)
pal::stringstream_t assembly_paths_stream(result.assembly_paths);
pal::stringstream_t assembly_paths_stream(result.assembly_paths());
std::vector<pal::string_t> resolved_assemblies;
pal::string_t assembly_path;
while (std::getline(assembly_paths_stream, assembly_path, PATH_SEPARATOR))
Expand All @@ -115,8 +125,8 @@ namespace

test_output << prefix << _X("corehost_resolve_component_dependencies:Success") << std::endl;
test_output << prefix << _X("corehost_resolve_component_dependencies assemblies:[") << assembly_paths_stream.str().c_str() << _X("]") << std::endl;
test_output << prefix << _X("corehost_resolve_component_dependencies native_search_paths:[") << result.native_search_paths.c_str() << _X("]") << std::endl;
test_output << prefix << _X("corehost_resolve_component_dependencies resource_search_paths:[") << result.resource_search_paths.c_str() << _X("]") << std::endl;
test_output << prefix << _X("corehost_resolve_component_dependencies native_search_paths:[") << result.native_search_paths().c_str() << _X("]") << std::endl;
test_output << prefix << _X("corehost_resolve_component_dependencies resource_search_paths:[") << result.resource_search_paths().c_str() << _X("]") << std::endl;
}
else
{
Expand Down