[tests] Remove TI.UnifiedTestConfig.DiagnosticMSBuild
.. as we always build with diagnostic verbosity now. And remove the parameter from `TI.BuildProject(..)`.
This commit is contained in:
Родитель
6278f108cf
Коммит
b578593a15
|
@ -141,7 +141,6 @@ namespace Xamarin.MMP.Tests
|
||||||
// Not necessarly required
|
// Not necessarly required
|
||||||
public bool FSharp { get; set; }
|
public bool FSharp { get; set; }
|
||||||
public bool XM45 { get; set; }
|
public bool XM45 { get; set; }
|
||||||
public bool DiagnosticMSBuild { get; set; }
|
|
||||||
public bool Release { get; set; } = false;
|
public bool Release { get; set; } = false;
|
||||||
|
|
||||||
public string ProjectName { get; set; } = "";
|
public string ProjectName { get; set; } = "";
|
||||||
|
@ -167,7 +166,6 @@ namespace Xamarin.MMP.Tests
|
||||||
public UnifiedTestConfig (string tmpDir)
|
public UnifiedTestConfig (string tmpDir)
|
||||||
{
|
{
|
||||||
TmpDir = tmpDir;
|
TmpDir = tmpDir;
|
||||||
DiagnosticMSBuild = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,7 +227,7 @@ namespace Xamarin.MMP.Tests
|
||||||
RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/msbuild", new StringBuilder (csprojTarget + " /t:clean"), "Clean");
|
RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/msbuild", new StringBuilder (csprojTarget + " /t:clean"), "Clean");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string BuildProject (string csprojTarget, bool isUnified, bool diagnosticMSBuild = false, bool shouldFail = false, bool release = false, string[] environment = null)
|
public static string BuildProject (string csprojTarget, bool isUnified, bool shouldFail = false, bool release = false, string[] environment = null)
|
||||||
{
|
{
|
||||||
string rootDirectory = FindRootDirectory ();
|
string rootDirectory = FindRootDirectory ();
|
||||||
|
|
||||||
|
@ -242,7 +240,7 @@ namespace Xamarin.MMP.Tests
|
||||||
// This is to force build to use our mmp and not system mmp
|
// This is to force build to use our mmp and not system mmp
|
||||||
StringBuilder buildArgs = new StringBuilder ();
|
StringBuilder buildArgs = new StringBuilder ();
|
||||||
if (isUnified) {
|
if (isUnified) {
|
||||||
buildArgs.Append (diagnosticMSBuild ? " /verbosity:diagnostic " : " /verbosity:normal ");
|
buildArgs.Append (" /verbosity:diagnostic ");
|
||||||
buildArgs.Append (" /property:XamarinMacFrameworkRoot=" + rootDirectory + "/Library/Frameworks/Xamarin.Mac.framework/Versions/Current ");
|
buildArgs.Append (" /property:XamarinMacFrameworkRoot=" + rootDirectory + "/Library/Frameworks/Xamarin.Mac.framework/Versions/Current ");
|
||||||
|
|
||||||
if (release)
|
if (release)
|
||||||
|
@ -378,7 +376,7 @@ namespace Xamarin.MMP.Tests
|
||||||
public static string GenerateAndBuildUnifiedExecutable (UnifiedTestConfig config, bool shouldFail = false, string[] environment = null)
|
public static string GenerateAndBuildUnifiedExecutable (UnifiedTestConfig config, bool shouldFail = false, string[] environment = null)
|
||||||
{
|
{
|
||||||
string csprojTarget = GenerateUnifiedExecutableProject (config);
|
string csprojTarget = GenerateUnifiedExecutableProject (config);
|
||||||
return BuildProject (csprojTarget, isUnified: true, diagnosticMSBuild: config.DiagnosticMSBuild, shouldFail: shouldFail, release: config.Release, environment: environment);
|
return BuildProject (csprojTarget, isUnified: true, shouldFail: shouldFail, release: config.Release, environment: environment);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string RunGeneratedUnifiedExecutable (UnifiedTestConfig config)
|
public static string RunGeneratedUnifiedExecutable (UnifiedTestConfig config)
|
||||||
|
@ -410,7 +408,7 @@ namespace Xamarin.MMP.Tests
|
||||||
{
|
{
|
||||||
Guid guid = Guid.NewGuid ();
|
Guid guid = Guid.NewGuid ();
|
||||||
string csprojTarget = GenerateClassicEXEProject (tmpDir, "ClassicExample.csproj", testCode + GenerateOutputCommand (tmpDir,guid), csprojConfig, includeMonoRuntime: includeMonoRuntime);
|
string csprojTarget = GenerateClassicEXEProject (tmpDir, "ClassicExample.csproj", testCode + GenerateOutputCommand (tmpDir,guid), csprojConfig, includeMonoRuntime: includeMonoRuntime);
|
||||||
string buildOutput = BuildProject (csprojTarget, isUnified : false, diagnosticMSBuild: false, shouldFail : shouldFail);
|
string buildOutput = BuildProject (csprojTarget, isUnified : false, shouldFail : shouldFail);
|
||||||
if (shouldFail)
|
if (shouldFail)
|
||||||
return new OutputText (buildOutput, "");
|
return new OutputText (buildOutput, "");
|
||||||
|
|
||||||
|
@ -427,7 +425,7 @@ namespace Xamarin.MMP.Tests
|
||||||
config.ProjectName = $"{projectName}.csproj";
|
config.ProjectName = $"{projectName}.csproj";
|
||||||
string csprojTarget = GenerateSystemMonoEXEProject (config);
|
string csprojTarget = GenerateSystemMonoEXEProject (config);
|
||||||
|
|
||||||
string buildOutput = BuildProject (csprojTarget, isUnified: true, diagnosticMSBuild: config.DiagnosticMSBuild, shouldFail: shouldFail, release: config.Release);
|
string buildOutput = BuildProject (csprojTarget, isUnified: true, shouldFail: shouldFail, release: config.Release);
|
||||||
if (shouldFail)
|
if (shouldFail)
|
||||||
return new OutputText (buildOutput, "");
|
return new OutputText (buildOutput, "");
|
||||||
|
|
||||||
|
|
|
@ -355,7 +355,7 @@ namespace Xamarin.MMP.Tests
|
||||||
|
|
||||||
// And try again.
|
// And try again.
|
||||||
// If we fail, we'll likley fail with "did not generate an exe" before returning but let's check anyway
|
// If we fail, we'll likley fail with "did not generate an exe" before returning but let's check anyway
|
||||||
string secondBuildOutput = TI.BuildProject (Path.Combine (tmpDir, TI.GetUnifiedExecutableProjectName (test)), true, diagnosticMSBuild: true);
|
string secondBuildOutput = TI.BuildProject (Path.Combine (tmpDir, TI.GetUnifiedExecutableProjectName (test)), true);
|
||||||
Assert.IsTrue (!secondBuildOutput.Contains ("Skipping target \"_CompileToNative"), "Did not skip");
|
Assert.IsTrue (!secondBuildOutput.Contains ("Skipping target \"_CompileToNative"), "Did not skip");
|
||||||
Assert.IsTrue (secondBuildOutput.Contains ("Building target \"_CompileToNative\" completely"), "Did need to build");
|
Assert.IsTrue (secondBuildOutput.Contains ("Building target \"_CompileToNative\" completely"), "Did need to build");
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,10 +163,10 @@ namespace Xamarin.MMP.Tests
|
||||||
{
|
{
|
||||||
var config = new TI.UnifiedTestConfig (tmpDir) { ProjectName = project, ItemGroup = nativeRefItemGroup };
|
var config = new TI.UnifiedTestConfig (tmpDir) { ProjectName = project, ItemGroup = nativeRefItemGroup };
|
||||||
string projectPath = TI.GenerateBindingLibraryProject (config);
|
string projectPath = TI.GenerateBindingLibraryProject (config);
|
||||||
string buildOutput = TI.BuildProject (projectPath, isUnified: true, diagnosticMSBuild: true);
|
string buildOutput = TI.BuildProject (projectPath, isUnified: true);
|
||||||
Assert.IsTrue (buildOutput.Contains (@"Building target ""CoreCompile"""));
|
Assert.IsTrue (buildOutput.Contains (@"Building target ""CoreCompile"""));
|
||||||
|
|
||||||
string secondBuildOutput = TI.BuildProject (projectPath, isUnified: true, diagnosticMSBuild: true);
|
string secondBuildOutput = TI.BuildProject (projectPath, isUnified: true);
|
||||||
Assert.IsFalse (secondBuildOutput.Contains (@"Building target ""CoreCompile"""));
|
Assert.IsFalse (secondBuildOutput.Contains (@"Building target ""CoreCompile"""));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -181,10 +181,10 @@ namespace Xamarin.MMP.Tests
|
||||||
{
|
{
|
||||||
var config = new TI.UnifiedTestConfig (tmpDir) { ProjectName = project };
|
var config = new TI.UnifiedTestConfig (tmpDir) { ProjectName = project };
|
||||||
string projectPath = TI.GenerateEXEProject (config);
|
string projectPath = TI.GenerateEXEProject (config);
|
||||||
string buildOutput = TI.BuildProject (projectPath, isUnified: true, diagnosticMSBuild: true);
|
string buildOutput = TI.BuildProject (projectPath, isUnified: true);
|
||||||
Assert.IsTrue (buildOutput.Contains (@"Building target ""_CompileToNative"""));
|
Assert.IsTrue (buildOutput.Contains (@"Building target ""_CompileToNative"""));
|
||||||
|
|
||||||
string secondBuildOutput = TI.BuildProject (projectPath, isUnified: true, diagnosticMSBuild: true);
|
string secondBuildOutput = TI.BuildProject (projectPath, isUnified: true);
|
||||||
Assert.IsFalse (secondBuildOutput.Contains (@"Building target ""_CompileToNative"""));
|
Assert.IsFalse (secondBuildOutput.Contains (@"Building target ""_CompileToNative"""));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Загрузка…
Ссылка в новой задаче