Skip to content

Fix dump test option writing out garbage trace file. #774

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
merged 1 commit into from
Feb 23, 2023
Merged

Fix dump test option writing out garbage trace file. #774

Show file tree
Hide file tree
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
18 changes: 9 additions & 9 deletions src/tests/D3D12Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ namespace gpgmm::d3d12 {
<< GPGMM_BYTES_TO_GB(mCaps->GetMaxResourceHeapSize()) << " GBs";
DebugLog() << "Creation of non-resident heaps: "
<< ((mCaps->IsCreateHeapNotResidentSupported()) ? "Supported" : "Not supported");

// Format the output trace file as <test suite>.<test>.
const testing::TestInfo* const testInfoPtr =
::testing::UnitTest::GetInstance()->current_test_info();
ASSERT_TRUE(testInfoPtr != nullptr);

mTraceFile = std::string(std::string(testInfoPtr->test_suite_name()) + "_" +
std::string(testInfoPtr->name()) + ".json");
}

void D3D12TestBase::TearDown() {
Expand All @@ -132,15 +140,7 @@ namespace gpgmm::d3d12 {
desc.RecordOptions.Flags |= EventRecordFlags::kAll;
desc.MinRecordLevel = desc.MinLogLevel;
desc.RecordOptions.UseDetailedTimingEvents = true;

// Format the output trace file as <test suite>.<test>.
const testing::TestInfo* const testInfoPtr =
::testing::UnitTest::GetInstance()->current_test_info();
ASSERT(testInfoPtr != nullptr);
desc.RecordOptions.TraceFile =
std::string(std::string(testInfoPtr->test_suite_name()) + "_" +
std::string(testInfoPtr->name()) + ".json")
.c_str();
desc.RecordOptions.TraceFile = mTraceFile.c_str();
}

return desc;
Expand Down
2 changes: 2 additions & 0 deletions src/tests/D3D12Test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include "tests/GPGMMTest.h"

#include <string>
#include <vector>

#include <gpgmm_d3d12.h>
Expand Down Expand Up @@ -72,6 +73,7 @@ namespace gpgmm::d3d12 {
ComPtr<IDXGIAdapter3> mAdapter;
ComPtr<ID3D12Device> mDevice;
std::unique_ptr<Caps> mCaps;
std::string mTraceFile;
};

} // namespace gpgmm::d3d12
Expand Down