Add a RuntimeExecutable configuration element.

Author: Alex Rønne Petersen

README.md

@@ -68,9 +68,9 @@ to package SDB releases.
 Additionally, `MODE` can be set to `Debug` (default) or `Release` to indicate
 the kind of build desired.
 
-Finally, `MONO_PREFIX` can be set to tell the test runner which Mono executable
-should be used. See the description of `RuntimePrefix` further down for more
-information.
+Finally, `MONO_PREFIX` and `MONO_BINARY` can be set to tell the test runner
+which Mono executable should be used. See the description of `RuntimePrefix`
+and `RuntimeExecutable` further down for more information.
 
 ## Usage
 
@@ -189,6 +189,13 @@ will want to set it to something like `C:\Program Files (x86)\Mono-3.0.10`.
 Or if you have Mono in some other directory, you might set it to e.g.
 `/opt/mono`.
 
+The `RuntimeExecutable` element is another way to specify which Mono executable
+to use. If `RuntimePrefix` is empty, then `RuntimeExecutable` is taken as the
+full path to the Mono executable. If both elements are non-empty, they are
+combined as `Path.Combine(RuntimePrefix, "bin", RuntimeExecutable)`. This
+configuration element is useful for switching between `mono32` and `mono64` on
+OS X in particular.
+
 You may want to set `DisableColors` to `true` if you don't want the fancy ANSI
 color codes that SDB emits.
 

chk/check.fs

@@ -81,13 +81,16 @@ let runTest () =
     for _ in 1 .. 3 do
         recv proc |> ignore
 
-    // Set the `RuntimePrefix` to `MONO_PREFIX` as
-    // specified in the `Makefile`.
+    // Set runtime location options from the `Makefile`.
     let prefix = Environment.GetEnvironmentVariable("MONO_PREFIX")
+    let exec = Environment.GetEnvironmentVariable("MONO_BINARY")
 
     send proc ("config set RuntimePrefix " + prefix)
     recv proc |> ignore
 
+    send proc ("config set RuntimeExecutable " + exec)
+    recv proc |> ignore
+
     let mutable ex = null
 
     try

src/Configuration.cs

@@ -79,6 +79,8 @@ public sealed class Configuration
 
         public bool PreferDisassembly { get; set; }
 
+        public string RuntimeExecutable { get; set; }
+
         public string RuntimePrefix { get; set; }
 
         public bool SaveDatabaseAutomatically { get; set; }
@@ -157,6 +159,9 @@ public static bool Read()
 
                     if (Current.DefaultDatabaseFile == null)
                         Current.DefaultDatabaseFile = string.Empty;
+
+                    if (Current.RuntimeExecutable == null)
+                        Current.RuntimeExecutable = string.Empty;
                 }
             }
             catch (Exception ex)
@@ -198,6 +203,7 @@ public static void Defaults()
             Current.MaxConnectionAttempts = 1;
             Current.MemberEvaluationTimeout = 5000;
             Current.RuntimePrefix = "/usr";
+            Current.RuntimeExecutable = string.Empty;
             Current.StepOverPropertiesAndOperators = true;
 
             var defs = Current.Extra.Select(kvp => Tuple.Create(kvp.Key, kvp.Value.Item1, kvp.Value.Item2));

src/Debugger.cs

@@ -410,17 +410,19 @@ public static void Run(FileInfo file)
                 _debuggeeKilled = false;
                 _kind = SessionKind.Launched;
 
-                var info = new SoftDebuggerStartInfo(Configuration.Current.RuntimePrefix,
-                                                     new Dictionary<string, string>(EnvironmentVariables))
+                var args = new SoftDebuggerLaunchArgs(Configuration.Current.RuntimePrefix,
+                                                      new Dictionary<string, string>(EnvironmentVariables))
+                {
+                    MonoExecutableFileName = Configuration.Current.RuntimeExecutable,
+                    MaxConnectionAttempts = Configuration.Current.MaxConnectionAttempts,
+                    TimeBetweenConnectionAttempts = Configuration.Current.ConnectionAttemptInterval
+                };
+
+                var info = new SoftDebuggerStartInfo(args)
                 {
                     Command = file.FullName,
                     Arguments = Arguments,
-                    WorkingDirectory = WorkingDirectory,
-                    StartArgs =
-                    {
-                        MaxConnectionAttempts = Configuration.Current.MaxConnectionAttempts,
-                        TimeBetweenConnectionAttempts = Configuration.Current.ConnectionAttemptInterval
-                    }
+                    WorkingDirectory = WorkingDirectory
                 };
 
                 // We need to ignore `SIGINT` while we start the inferior