From eddc56947cd5dd367e6767283dc48a96ce593bcc Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Mon, 20 Jul 2020 11:20:44 +0200 Subject: [PATCH 1/2] [xharness] Allow for null environment variables to mlaunch. It's a valid scenario to set a null environment variable. This happens when changing InCI to always return true (to test locally what's done on the bots), in which case we try to forward BUILD_REVISION to mlaunch, but BUILD_REVISION isn't necessarily set. Not forwarding it to mlaunch should not cause problems in most tests, so just allow this scenario. --- .../Execution/Mlaunch/Arguments.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs index f1f959034df2..1c37c3def032 100644 --- a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs +++ b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs @@ -181,10 +181,11 @@ public sealed class SetEnvVariableArgument : MlaunchArgument { public SetEnvVariableArgument (string variableName, object variableValue) { this.variableName = variableName ?? throw new ArgumentNullException (nameof (variableName)); - this.variableValue = variableValue?.ToString () ?? throw new ArgumentNullException (nameof (variableValue)); - if (variableValue is bool) - this.variableValue = this.variableValue.ToLower (); + if (variableValue is bool b) + this.variableValue = b.ToString ().ToLower (); + else + this.variableValue = variableValue?.ToString (); } public override string AsCommandLineArgument () => Escape ($"-setenv={variableName}={variableValue}"); From 76c095e37dca0e979ead6f81edca83051f5c4d15 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 22 Jul 2020 14:36:43 +0200 Subject: [PATCH 2/2] Use ToLowerInvariant instead of ToLower. --- .../Execution/Mlaunch/Arguments.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs index 1c37c3def032..e15b0d78fc90 100644 --- a/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs +++ b/tests/xharness/Microsoft.DotNet.XHarness.iOS.Shared/Execution/Mlaunch/Arguments.cs @@ -183,7 +183,7 @@ public SetEnvVariableArgument (string variableName, object variableValue) this.variableName = variableName ?? throw new ArgumentNullException (nameof (variableName)); if (variableValue is bool b) - this.variableValue = b.ToString ().ToLower (); + this.variableValue = b.ToString ().ToLowerInvariant (); else this.variableValue = variableValue?.ToString (); }