[xharness] Don't include 32-bit XM targets in grouped Makefile targets.
Fixes an issue with the packaged XM tests, where they don't build because we try to build 32-bit tests.
This commit is contained in:
Родитель
5eb8a5f42c
Коммит
61baa008d4
|
@ -82,6 +82,7 @@ namespace xharness
|
|||
public string JENKINS_RESULTS_DIRECTORY { get; set; } // Use same name as in Makefiles, so that a grep finds it.
|
||||
public string MAC_DESTDIR { get; set; }
|
||||
public string IOS_DESTDIR { get; set; }
|
||||
public bool IncludeMac32 { get; set; }
|
||||
|
||||
// Run
|
||||
public AppRunnerTarget Target { get; set; }
|
||||
|
|
|
@ -4,6 +4,11 @@ namespace xharness
|
|||
{
|
||||
public class MacClassicTarget : MacTarget
|
||||
{
|
||||
public MacClassicTarget ()
|
||||
{
|
||||
ThirtyTwoBit = true;
|
||||
}
|
||||
|
||||
protected override void ExecuteInternal ()
|
||||
{
|
||||
// nothing to do here
|
||||
|
|
|
@ -4,6 +4,8 @@ namespace xharness
|
|||
{
|
||||
public class MacTarget : Target
|
||||
{
|
||||
public bool ThirtyTwoBit;
|
||||
|
||||
protected override bool FixProjectReference (string name)
|
||||
{
|
||||
switch (name) {
|
||||
|
|
|
@ -12,7 +12,6 @@ namespace xharness
|
|||
bool IsBCL => BCLInfo != null;
|
||||
|
||||
bool SkipProjectGeneration;
|
||||
bool ThirtyTwoBit;
|
||||
bool SkipSuffix;
|
||||
|
||||
public MacUnifiedTarget (bool mobile, bool thirtyTwoBit, bool shouldSkipProjectGeneration = false, bool skipSuffix = false) : base ()
|
||||
|
|
|
@ -194,7 +194,11 @@ namespace xharness
|
|||
writer.WriteLine ("# Container targets that run multiple test projects");
|
||||
writer.WriteLine ();
|
||||
|
||||
var grouped = allTargets.GroupBy ((target) => target.SimplifiedName);
|
||||
IEnumerable<MacTarget> groupableTargets = allTargets;
|
||||
if (!harness.IncludeMac32)
|
||||
groupableTargets = groupableTargets.Where ((v) => !v.ThirtyTwoBit);
|
||||
|
||||
var grouped = groupableTargets.GroupBy ((target) => target.SimplifiedName);
|
||||
foreach (MacTargetNameType action in Enum.GetValues (typeof (MacTargetNameType))) {
|
||||
var actionName = action.ToString ().ToLowerInvariant ();
|
||||
foreach (var group in grouped) {
|
||||
|
@ -210,7 +214,7 @@ namespace xharness
|
|||
|
||||
writer.WriteLine ("mac-run run-mac:");
|
||||
writer.WriteLine ("\t$(Q) rm -rf \".$@-failure.stamp\"");
|
||||
foreach (var target in allTargets) {
|
||||
foreach (var target in groupableTargets) {
|
||||
if (target is MacClassicTarget)
|
||||
writer.WriteLine ("\t$(Q) $(MAKE) {0} || echo \"{0} failed\" >> \".$@-failure.stamp\"", MakeMacClassicTargetName (target, MacTargetNameType.Run));
|
||||
else if (target is MacUnifiedTarget)
|
||||
|
@ -224,7 +228,7 @@ namespace xharness
|
|||
|
||||
writer.WriteLine ("mac-build mac-build-all build-mac:"); // build everything
|
||||
writer.WriteLine ("\t$(Q) rm -rf \".$@-failure.stamp\"");
|
||||
foreach (var target in allTargets) {
|
||||
foreach (var target in groupableTargets) {
|
||||
if (target is MacClassicTarget)
|
||||
writer.WriteLine ("\t$(Q) $(MAKE) {0} || echo \"{0} failed\" >> \".$@-failure.stamp\"", MakeMacClassicTargetName (target, MacTargetNameType.Build));
|
||||
else if (target is MacUnifiedTarget)
|
||||
|
|
Загрузка…
Ссылка в новой задаче