From ef5015e52b7858555caebf14e77621444d6ca4e6 Mon Sep 17 00:00:00 2001 From: Bryan Bernhart Date: Thu, 19 May 2022 11:25:09 -0700 Subject: [PATCH] Apply CLI params in capture_replay_tests. CLI params never got set when a test requested different params. --- .../capture_replay_tests/GPGMMCaptureReplayTests.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/capture_replay_tests/GPGMMCaptureReplayTests.cpp b/src/tests/capture_replay_tests/GPGMMCaptureReplayTests.cpp index c7a4c0e8e..dcca99b26 100644 --- a/src/tests/capture_replay_tests/GPGMMCaptureReplayTests.cpp +++ b/src/tests/capture_replay_tests/GPGMMCaptureReplayTests.cpp @@ -245,11 +245,11 @@ void CaptureReplayTestWithParams::RunSingleTest(const TestEnviromentParams& forc void CaptureReplayTestWithParams::RunTestLoop(const TestEnviromentParams& forceParams) { TestEnviromentParams envParams = gTestEnv->GetParams(); if (forceParams.IsCaptureEnabled != envParams.IsCaptureEnabled) { - envParams.IsCaptureEnabled = forceParams.IsCaptureEnabled; + envParams.IsCaptureEnabled |= forceParams.IsCaptureEnabled; } if (forceParams.IsSameCapsRequired != envParams.IsSameCapsRequired) { - envParams.IsSameCapsRequired = forceParams.IsSameCapsRequired; + envParams.IsSameCapsRequired |= forceParams.IsSameCapsRequired; } if (forceParams.Iterations != envParams.Iterations) { @@ -257,15 +257,15 @@ void CaptureReplayTestWithParams::RunTestLoop(const TestEnviromentParams& forceP } if (forceParams.IsPrefetchAllowed != envParams.IsPrefetchAllowed) { - envParams.IsPrefetchAllowed = forceParams.IsPrefetchAllowed; + envParams.IsPrefetchAllowed |= forceParams.IsPrefetchAllowed; } if (forceParams.IsSuballocationDisabled != envParams.IsSuballocationDisabled) { - envParams.IsSuballocationDisabled = forceParams.IsSuballocationDisabled; + envParams.IsSuballocationDisabled |= forceParams.IsSuballocationDisabled; } if (forceParams.IsNeverAllocate != envParams.IsNeverAllocate) { - envParams.IsNeverAllocate = forceParams.IsNeverAllocate; + envParams.IsNeverAllocate |= forceParams.IsNeverAllocate; } for (uint32_t i = 0; i < envParams.Iterations; i++) {