diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 57701cc4..36a21da9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,7 +22,7 @@ jobs: - name: Generate test cases working-directory: ./test/Esprima.Tests.Test262 - run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release + run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release --framework net6.0 -- --update-allow-list - name: Test run: dotnet test --configuration Release --logger GitHubActions @@ -39,7 +39,7 @@ jobs: - name: Generate test cases working-directory: ./test/Esprima.Tests.Test262 - run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release -- --update-allow-list + run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release --framework net6.0 -- --update-allow-list - name: Test run: dotnet test --configuration Release --framework net6.0 --logger GitHubActions diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b599edbf..70662c4d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Generate test cases working-directory: ./test/Esprima.Tests.Test262 - run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release + run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release --framework net6.0 - name: Test run: dotnet test --configuration Release --framework net6.0 --logger GitHubActions diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 93f5525b..a03b8152 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -22,7 +22,7 @@ jobs: - name: Generate test cases working-directory: ./test/Esprima.Tests.Test262 - run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release + run: dotnet tool restore && dotnet test262 generate && dotnet run -c Release --framework net6.0 - name: Test run: dotnet test --configuration Release --logger GitHubActions diff --git a/global.json b/global.json new file mode 100644 index 00000000..989a69ca --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.100", + "rollForward": "latestMinor" + } +} \ No newline at end of file diff --git a/test/Esprima.Tests.SourceGenerators/SourceGeneratorTest.cs b/test/Esprima.Tests.SourceGenerators/SourceGeneratorTest.cs index ff716b84..0838a22b 100644 --- a/test/Esprima.Tests.SourceGenerators/SourceGeneratorTest.cs +++ b/test/Esprima.Tests.SourceGenerators/SourceGeneratorTest.cs @@ -10,6 +10,6 @@ protected static string LoadEsprimaSourceFile(string file) protected static string ToEsprimaSourcePath(string path) { - return Path.Combine("../../../../../src/Esprima/", path); + return Path.Combine("../../../../src/Esprima/", path); } } diff --git a/test/Esprima.Tests.Test262/Program.cs b/test/Esprima.Tests.Test262/Program.cs index 261ac871..1aa8bc1b 100644 --- a/test/Esprima.Tests.Test262/Program.cs +++ b/test/Esprima.Tests.Test262/Program.cs @@ -16,9 +16,9 @@ public static class Program public static async Task Main(string[] args) { var rootDirectory = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location) ?? string.Empty; - var projectRoot = Path.Combine(rootDirectory, "../../.."); + var solutionRoot = Path.Combine(rootDirectory, "../../../.."); - var allowListFile = Path.Combine(projectRoot, "allow-list.txt"); + var allowListFile = new FileInfo(Path.Combine(solutionRoot, "test", "Esprima.Tests.Test262", "allow-list.txt")).FullName; var lines = File.Exists(allowListFile) ? await File.ReadAllLinesAsync(allowListFile) : Array.Empty(); var knownFailing = new HashSet(lines .Where(x => !string.IsNullOrWhiteSpace(x) && !x.StartsWith("#", StringComparison.Ordinal)) diff --git a/test/Esprima.Tests/Fixtures.cs b/test/Esprima.Tests/Fixtures.cs index cfd05f99..9c11409d 100644 --- a/test/Esprima.Tests/Fixtures.cs +++ b/test/Esprima.Tests/Fixtures.cs @@ -258,8 +258,8 @@ internal static string GetFixturesPath() var assemblyPath = typeof(Fixtures).GetTypeInfo().Assembly.Location; var assemblyDirectory = new FileInfo(assemblyPath).Directory; #endif - var root = assemblyDirectory?.Parent?.Parent?.Parent?.FullName; - return root ?? ""; + var root = assemblyDirectory?.Parent?.Parent?.Parent?.Parent?.FullName; + return Path.Combine(root ?? "", "test", "Esprima.Tests"); } private sealed class FixtureMetadata