[xharness] Find a different mlaunch if legacy Xamarin is disabled. (#15996)
This commit is contained in:
Родитель
ee1324ebd6
Коммит
6e49a6748a
|
@ -74,6 +74,7 @@ test.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/eng/Version.De
|
|||
@echo "MACOS_SDK_VERSION=$(MACOS_SDK_VERSION)" >> $@
|
||||
@echo "DOTNET_BCL_DIR=$(DOTNET_BCL_DIR)" >> $@
|
||||
@echo "ENABLE_DOTNET=$(ENABLE_DOTNET)" >> $@
|
||||
@echo "INCLUDE_XAMARIN_LEGACY=$(INCLUDE_XAMARIN_LEGACY)" >> $@
|
||||
@printf "$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),DOTNET_$(platform)_RUNTIME_IDENTIFIERS='$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS)'\\n)" | sed 's/^ //' >> $@
|
||||
@printf "$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),DOTNET_$(rid)_ARCHITECTURES='$(DOTNET_$(rid)_ARCHITECTURES)'\\n))" | sed 's/^ //' >> $@
|
||||
@echo "DOTNET_CSC_COMMAND='$(DOTNET_CSC)'" >> $@
|
||||
|
@ -97,6 +98,7 @@ test-system.config: Makefile $(TOP)/Make.config $(TOP)/mk/mono.mk $(TOP)/eng/Ver
|
|||
@echo "DOTNET_TFM=$(DOTNET_TFM)" >> $@
|
||||
@echo "DOTNET_BCL_DIR=$(DOTNET_BCL_DIR)" >> $@
|
||||
@echo "ENABLE_DOTNET=$(ENABLE_DOTNET)" >> $@
|
||||
@echo "INCLUDE_XAMARIN_LEGACY=$(INCLUDE_XAMARIN_LEGACY)" >> $@
|
||||
@printf "$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),DOTNET_$(platform)_RUNTIME_IDENTIFIERS='$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS)'\\n)" | sed 's/^ //' >> $@
|
||||
@printf "$(foreach platform,$(DOTNET_PLATFORMS_UPPERCASE),$(foreach rid,$(DOTNET_$(platform)_RUNTIME_IDENTIFIERS),DOTNET_$(rid)_ARCHITECTURES='$(DOTNET_$(rid)_ARCHITECTURES)'\\n))" | sed 's/^ //' >> $@
|
||||
@echo "DOTNET_CSC_COMMAND='$(DOTNET_CSC)'" >> $@
|
||||
|
|
|
@ -103,7 +103,21 @@ namespace Xharness {
|
|||
}
|
||||
}
|
||||
|
||||
string MlaunchPath => Path.Combine (IOS_DESTDIR, "Library", "Frameworks", "Xamarin.iOS.framework", "Versions", "Current", "bin", "mlaunch");
|
||||
string MlaunchPath {
|
||||
get {
|
||||
if (INCLUDE_XAMARIN_LEGACY) {
|
||||
if (INCLUDE_IOS)
|
||||
return Path.Combine (IOS_DESTDIR, "Library", "Frameworks", "Xamarin.iOS.framework", "Versions", "Current", "bin", "mlaunch");
|
||||
} else {
|
||||
var dotnetRootDir = Path.Combine (RootDirectory, "..", "_build");
|
||||
if (INCLUDE_IOS)
|
||||
return Path.Combine (dotnetRootDir, "Microsoft.iOS.Sdk", "tools", "bin", "mlaunch");
|
||||
if (INCLUDE_TVOS)
|
||||
return Path.Combine (dotnetRootDir, "Microsoft.tvOS.Sdk", "tools", "bin", "mlaunch");
|
||||
}
|
||||
return $"Not building any mobile platform, so can't provide a location to mlaunch.";
|
||||
}
|
||||
}
|
||||
|
||||
public List<iOSTestProject> IOSTestProjects { get; }
|
||||
public List<MacTestProject> MacTestProjects { get; } = new List<MacTestProject> ();
|
||||
|
@ -131,6 +145,7 @@ namespace Xharness {
|
|||
public string MONO_MAC_SDK_DESTDIR { get; }
|
||||
public bool ENABLE_XAMARIN { get; }
|
||||
public bool ENABLE_DOTNET { get; }
|
||||
public bool INCLUDE_XAMARIN_LEGACY { get; }
|
||||
|
||||
// Run
|
||||
|
||||
|
@ -204,6 +219,7 @@ namespace Xharness {
|
|||
MONO_MAC_SDK_DESTDIR = config ["MONO_MAC_SDK_DESTDIR"];
|
||||
ENABLE_XAMARIN = config.ContainsKey ("ENABLE_XAMARIN") && !string.IsNullOrEmpty (config ["ENABLE_XAMARIN"]);
|
||||
ENABLE_DOTNET = config.ContainsKey ("ENABLE_DOTNET") && !string.IsNullOrEmpty (config ["ENABLE_DOTNET"]);
|
||||
INCLUDE_XAMARIN_LEGACY = config.ContainsKey ("INCLUDE_XAMARIN_LEGACY") && !string.IsNullOrEmpty (config ["INCLUDE_XAMARIN_LEGACY"]);
|
||||
|
||||
if (string.IsNullOrEmpty (SdkRoot))
|
||||
SdkRoot = config ["XCODE_DEVELOPER_ROOT"] ?? configuration.SdkRoot;
|
||||
|
|
|
@ -44,6 +44,7 @@ namespace Xharness {
|
|||
string MONO_MAC_SDK_DESTDIR { get; }
|
||||
bool ENABLE_XAMARIN { get; }
|
||||
bool ENABLE_DOTNET { get; }
|
||||
bool INCLUDE_XAMARIN_LEGACY { get; }
|
||||
string XcodeRoot { get; }
|
||||
string LogDirectory { get; }
|
||||
double Timeout { get; }
|
||||
|
|
Загрузка…
Ссылка в новой задаче