Browse Source

Cleanup legacy build/test files.

pull/1815/head
Jeremy Koritzinsky 8 years ago
parent
commit
23d252f608
  1. 10
      build.cake
  2. 2
      build/iOSWorkarounds.props
  3. 20
      tests/run-tests.sh

10
build.cake

@ -110,11 +110,8 @@ void DotNetCoreBuild(Parameters parameters)
var settings = new DotNetCoreBuildSettings
{
Configuration = parameters.Configuration,
MSBuildSettings = new DotNetCoreMSBuildSettings(),
};
settings.MSBuildSettings.SetConfiguration(parameters.Configuration);
DotNetCoreBuild(parameters.MSBuildSolution, settings);
}
@ -126,11 +123,8 @@ Task("Build-Impl")
MSBuild(data.Parameters.MSBuildSolution, settings => {
settings.SetConfiguration(data.Parameters.Configuration);
settings.SetVerbosity(Verbosity.Minimal);
settings.WithProperty("UseRoslynPathHack", "true");
settings.WithProperty("iOSRoslynPathHackRequired", "true");
settings.UseToolVersion(MSBuildToolVersion.VS2017);
settings.WithProperty("Windows", "True");
settings.SetNodeReuse(false);
settings.SetMaxCpuCount(0);
settings.WithRestore();
});
}
@ -178,7 +172,7 @@ Task("Run-Unit-Tests-Impl")
RunCoreTest("./tests/Avalonia.Skia.UnitTests", data.Parameters, false);
if (data.Parameters.IsRunningOnWindows)
{
RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", data.Parameters, true);
RunCoreTest("./tests/Avalonia.Direct2D1.UnitTests", data.Parameters, false);
}
});

2
build/iOSWorkarounds.props

@ -1,5 +1,5 @@
<Project>
<PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'">
<PropertyGroup Condition="'$(iOSRoslynPathHackRequired)' == 'true'">
<CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
</PropertyGroup>
</Project>

20
tests/run-tests.sh

@ -1,20 +0,0 @@
# !/bin/bash
cd "$(dirname "$0")"
tests=(Avalonia.*.UnitTests/)
exclude=("*Direct2D*/")
result=0
for del in ${exclude[@]}; do
tests=(${tests[@]/$del})
done
for test in ${tests[@]}; do
echo Running test $test
mono ../testrunner/xunit.runner.console.2.1.0/tools/xunit.console.exe ${test}bin/Release/${test%/}.dll -parallel none
if [ $? -ne 0 ]; then result=1 ; fi
done
exit $result
Loading…
Cancel
Save