Merge pull request dotnet#2 from jashook/small_change

Small changes from Jarret
trylek · Aug 12, 2020 · a18b89f · a18b89f
2 parents fdc92f3 + b9efb3d
commit a18b89f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/coreclr/scripts/coreclr_arguments.py b/src/coreclr/scripts/coreclr_arguments.py
@@ -73,7 +73,7 @@ def __init__(self,
 
         self.valid_arches = ["x64", "x86", "arm", "arm64", "wasm"]
         self.valid_build_types = ["Debug", "Checked", "Release"]
-        self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris", "browser"]
+        self.valid_host_os = ["Windows_NT", "OSX", "Linux", "illumos", "Solaris", "Browser"]
 
         self.__initialize__(args)
 

diff --git a/src/coreclr/tests/runtest.py b/src/coreclr/tests/runtest.py
@@ -1002,9 +1002,10 @@ def setup_args(args):
         location using the build type and the arch.
     """
 
+    requires_coreroot = args.arch.lower() != "wasm"
     coreclr_setup_args = CoreclrArguments(args, 
                                           require_built_test_dir=True,
-                                          require_built_core_root=True, 
+                                          require_built_core_root=requires_coreroot, 
                                           require_built_product_dir=False)
 
     normal_location = os.path.join(coreclr_setup_args.artifacts_location, "tests", "coreclr", "%s.%s.%s" % (coreclr_setup_args.host_os, coreclr_setup_args.arch, coreclr_setup_args.build_type))

diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
@@ -3,7 +3,7 @@
 
   <Target Name="ResolveDisabledProjects" BeforeTargets="BuildAllProjects;CopyAllNativeTestProjectBinaries" >
     <PropertyGroup>
-      <TestRoot>$(RepoRoot)src\tests\</TestRoot>
+      <TestRoot>$(RepoRoot)src\tests</TestRoot>
     </PropertyGroup>
 
     <ItemGroup>
@@ -25,7 +25,7 @@
     <ItemGroup>
       <!-- <AllProjects Include="$(TestRoot)**\*.csproj" Exclude="@(DisabledProjects)" />
       <AllProjects Include="$(TestRoot)**\*.ilproj" Exclude="@(DisabledProjects)" /> -->
-      <AllProjects Include="$(TestRoot)/JIT/methodical/divrem/div/i4div_cs_do.csproj" />
+      <AllProjects Include="$(TestRoot)/JIT/Methodical/divrem/div/i4div_cs_do.csproj" />
     </ItemGroup>
 
     <!-- All the test projects are partitioned into the test groups as defined below.