Browse Source

Fix unit tests search pattern

pull/735/head
Wiesław Šoltés 10 years ago
parent
commit
3b088a4b4d
  1. 20
      build.cake

20
build.cake

@ -635,21 +635,19 @@ Task("Run-Unit-Tests")
.WithCriteria(() => !skipTests) .WithCriteria(() => !skipTests)
.Does(() => .Does(() =>
{ {
var pattern = "./tests/Avalonia.*.UnitTests/bin/" + dirSuffix + "/Avalonia.*.UnitTests.dll"; var unitTests = GetDirectories("./tests/Avalonia.*.UnitTests")
.Select(dir => System.IO.Path.GetFileName(dir.FullPath))
Func<IFileSystemInfo, bool> ExcludeWindowsTests = i => { .Where(name => isRunningOnWindows ? true : !(name.IndexOf("Direct2D", StringComparison.OrdinalIgnoreCase) >= 0))
return !(i.Path.FullPath.IndexOf("Direct2D", StringComparison.OrdinalIgnoreCase) >= 0); .Select(name => MakeAbsolute(File("./tests/" + name + "/bin/" + dirSuffix + "/" + name + ".dll")))
}; .ToList();
var unitTests = isRunningOnWindows ? GetFiles(pattern) : GetFiles(pattern, ExcludeWindowsTests);
if (isRunningOnWindows) if (isRunningOnWindows)
{ {
var windowsTests = GetFiles("./tests/Avalonia.DesignerSupport.Tests/bin/" + dirSuffix + "/*Tests.dll") + var windowsTests = GetFiles("./tests/Avalonia.DesignerSupport.Tests/bin/" + dirSuffix + "/*.Tests.dll") +
GetFiles("./tests/Avalonia.LeakTests/bin/" + dirSuffix + "/*Tests.dll") + GetFiles("./tests/Avalonia.LeakTests/bin/" + dirSuffix + "/*.LeakTests.dll") +
GetFiles("./tests/Avalonia.RenderTests/bin/" + dirSuffix + "/*Tests.dll"); GetFiles("./tests/Avalonia.RenderTests/bin/" + dirSuffix + "/*.RenderTests.dll");
unitTests += windowsTests; unitTests.AddRange(windowsTests);
} }
var toolPath = (isPlatformAnyCPU || isPlatformX86) ? var toolPath = (isPlatformAnyCPU || isPlatformX86) ?

Loading…
Cancel
Save