From 70960fb73cb2f84a9b610ca18fef62eee7b0559a Mon Sep 17 00:00:00 2001
From: Max Charlamb <maxcharlamb@microsoft.com>
Date: Wed, 10 Jun 2026 11:16:44 -0400
Subject: [PATCH] [cdac] Build + run DataGenerator tests under the existing
 tools.cdactests subset

The DataGeneratorTests project (cdac/tests/DataGenerator/) had no
subset and was not built or executed in CI. Add it to the existing
tools.cdactests subset (which already builds the cDAC UnitTests
project) so the DataGenerator tests run on the existing CLR_Tools_Tests
CI leg with no separate subset or extra wiring elsewhere.

Also override the new Target.ReadNInt abstract method (added in
e9e3c8dbc92) on the test-only TestTarget mock so the project compiles.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/Subsets.props                                         | 1 +
 src/native/managed/cdac/tests/DataGenerator/TestTarget.cs | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/eng/Subsets.props b/eng/Subsets.props
index b753c4422c1d55..5c918413d1b73d 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -531,6 +531,7 @@
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdactests+'))">
     <ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\UnitTests\Microsoft.Diagnostics.DataContractReader.Tests.csproj" Test="true" Category="tools"/>
+    <ProjectToBuild Include="$(SharedNativeRoot)managed\cdac\tests\DataGenerator\Microsoft.Diagnostics.DataContractReader.DataGeneratorTests.csproj" Test="true" Category="tools"/>
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+tools.cdacdumptests+'))">
diff --git a/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs b/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
index e1e9a7e8bd6392..b823054d3b0220 100644
--- a/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
+++ b/src/native/managed/cdac/tests/DataGenerator/TestTarget.cs
@@ -199,6 +199,9 @@ public override TargetCodePointer ReadCodePointer(ulong address)
     public override TargetNUInt ReadNUInt(ulong address)
         => new TargetNUInt(PointerSize == 8 ? Read<ulong>(address) : Read<uint>(address));
 
+    public override TargetNInt ReadNInt(ulong address)
+        => new TargetNInt(PointerSize == 8 ? Read<long>(address) : Read<int>(address));
+
     public override void Write<T>(ulong address, T value)
     {
         Span<byte> span = GetSpan(address, System.Runtime.CompilerServices.Unsafe.SizeOf<T>());