diff --git a/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.cs b/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.cs index 1756f4ec945573..e7f2e787245705 100644 --- a/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.cs +++ b/src/tests/tracing/eventpipe/rundownvalidation/rundownvalidation.cs @@ -42,12 +42,30 @@ public static int Main() private static Func> _DoesRundownContainMethodEvents = (source) => { + bool hasRuntimeStart = false; + bool hasMethodDCStopInit = false; + bool hasMethodDCStopComplete = false; + bool hasLoaderModuleDCStop = false; + bool hasLoaderDomainModuleDCStop = false; + bool hasAssemblyModuleDCStop = false; bool hasMethodDCStopVerbose = false; bool hasMethodILToNativeMap = false; + bool hasAppDomainDCStop = false; + ClrRundownTraceEventParser rundownParser = new ClrRundownTraceEventParser(source); + rundownParser.RuntimeStart += (eventData) => hasRuntimeStart = true; + rundownParser.MethodDCStopInit += (eventData) => hasMethodDCStopInit = true; + rundownParser.MethodDCStopComplete += (eventData) => hasMethodDCStopComplete = true; + rundownParser.LoaderModuleDCStop += (eventData) => hasLoaderModuleDCStop = true; + rundownParser.LoaderDomainModuleDCStop += (eventData) => hasLoaderDomainModuleDCStop = true; + rundownParser.LoaderAssemblyDCStop += (eventData) => hasAssemblyModuleDCStop = true; rundownParser.MethodDCStopVerbose += (eventData) => hasMethodDCStopVerbose = true; rundownParser.MethodILToNativeMapDCStop += (eventData) => hasMethodILToNativeMap = true; - return () => hasMethodDCStopVerbose && hasMethodILToNativeMap ? 100 : -1; + rundownParser.LoaderAppDomainDCStop += (eventData) => hasAppDomainDCStop = true; + return () => + hasRuntimeStart && hasMethodDCStopInit && hasMethodDCStopComplete && + hasLoaderModuleDCStop && hasLoaderDomainModuleDCStop && hasAssemblyModuleDCStop && + hasMethodDCStopVerbose && hasMethodILToNativeMap && hasAppDomainDCStop ? 100 : -1; }; } }