Browse Source

Update Test262Harness and other test project dependencies (#1185)

Marko Lahma 3 years ago
parent
commit
59dc54d6ff

+ 1 - 1
Jint.Tests.CommonScripts/Jint.Tests.CommonScripts.csproj

@@ -11,7 +11,7 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
   </ItemGroup>

+ 1 - 1
Jint.Tests.Test262/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "isRoot": true,
   "tools": {
   "tools": {
     "test262harness.console": {
     "test262harness.console": {
-      "version": "0.0.13",
+      "version": "0.0.17",
       "commands": [
       "commands": [
         "test262"
         "test262"
       ]
       ]

+ 2 - 2
Jint.Tests.Test262/Jint.Tests.Test262.csproj

@@ -11,10 +11,10 @@
     <ProjectReference Include="..\Jint\Jint.csproj" />
     <ProjectReference Include="..\Jint\Jint.csproj" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Test262Harness" Version="0.0.13" />
+    <PackageReference Include="Test262Harness" Version="0.0.17" />
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <Using Include="NUnit.Framework" />
     <Using Include="NUnit.Framework" />

+ 7 - 1
Jint.Tests.Test262/Test262Test.cs

@@ -20,6 +20,12 @@ public abstract partial class Test262Test
             cfg.EnableModules(new Test262ModuleLoader(State.Test262Stream.Options.FileSystem, relativePath));
             cfg.EnableModules(new Test262ModuleLoader(State.Test262Stream.Options.FileSystem, relativePath));
         });
         });
 
 
+        if (file.Flags.Contains("raw"))
+        {
+            // nothing should be loaded
+            return engine;
+        }
+
         engine.Execute(State.Sources["assert.js"]);
         engine.Execute(State.Sources["assert.js"]);
         engine.Execute(State.Sources["sta.js"]);
         engine.Execute(State.Sources["sta.js"]);
 
 
@@ -79,7 +85,7 @@ public abstract partial class Test262Test
             engine.Execute(new JavaScriptParser(file.Program, new ParserOptions(file.FileName)).ParseScript());
             engine.Execute(new JavaScriptParser(file.Program, new ParserOptions(file.FileName)).ParseScript());
         }
         }
     }
     }
-    
+
     private partial bool ShouldThrow(Test262File testCase, bool strict)
     private partial bool ShouldThrow(Test262File testCase, bool strict)
     {
     {
         return testCase.Negative;
         return testCase.Negative;

+ 2 - 2
Jint.Tests/Jint.Tests.csproj

@@ -19,10 +19,10 @@
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <PackageReference Include="Flurl.Http.Signed" Version="3.2.0" />
     <PackageReference Include="Flurl.Http.Signed" Version="3.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="MongoDB.Bson.signed" Version="2.14.1" />
     <PackageReference Include="MongoDB.Bson.signed" Version="2.14.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
   </ItemGroup>
 </Project>
 </Project>