Index: source/Commands/CommandObjectPlatform.cpp
===================================================================
--- source/Commands/CommandObjectPlatform.cpp
+++ source/Commands/CommandObjectPlatform.cpp
@@ -2281,16 +2281,19 @@
     LoadSubCommand ("connect", CommandObjectSP (new CommandObjectPlatformConnect (interpreter)));
     LoadSubCommand ("disconnect", CommandObjectSP (new CommandObjectPlatformDisconnect (interpreter)));
     LoadSubCommand ("settings", CommandObjectSP (new CommandObjectPlatformSettings (interpreter)));
+#ifdef LLDB_CONFIGURATION_DEBUG
     LoadSubCommand ("mkdir", CommandObjectSP (new CommandObjectPlatformMkDir (interpreter)));
     LoadSubCommand ("file", CommandObjectSP (new CommandObjectPlatformFile (interpreter)));
     LoadSubCommand ("get-file", CommandObjectSP (new CommandObjectPlatformGetFile (interpreter)));
     LoadSubCommand ("get-size", CommandObjectSP (new CommandObjectPlatformGetSize (interpreter)));
     LoadSubCommand ("put-file", CommandObjectSP (new CommandObjectPlatformPutFile (interpreter)));
+#endif
     LoadSubCommand ("process", CommandObjectSP (new CommandObjectPlatformProcess (interpreter)));
     LoadSubCommand ("shell", CommandObjectSP (new CommandObjectPlatformShell (interpreter)));
     LoadSubCommand ("target-install", CommandObjectSP (new CommandObjectPlatformInstall (interpreter)));
 }
 
+
 //----------------------------------------------------------------------
 // Destructor
 //----------------------------------------------------------------------
Index: test/types/AbstractBase.py
===================================================================
--- test/types/AbstractBase.py
+++ test/types/AbstractBase.py
@@ -50,7 +50,7 @@
     #         True: build dSYM file                                            #
     #         False: build DWARF map                                           #
     # bc -> blockCaptured (defaulted to False)                                 #
-    #         True: testing vars of various basic types from inside a block    #
+    #         True: testing vars of various basic types from isnide a block    #
     #         False: testing vars of various basic types from a function       #
     # qd -> quotedDisplay (defaulted to False)                                 #
     #         True: the output from 'frame var' or 'expr var' contains a pair  #
@@ -88,11 +88,7 @@
 
         # First, capture the golden output emitted by the oracle, i.e., the
         # series of printf statements.
-
-        # process launch command output redirect always goes to host the process is running on
-        self.runCmd('process launch -o /tmp/golden-output.txt')
-        # if this is a remote test, get-file will copy it back over, else it will just copy
-        self.runCmd('platform get-file /tmp/golden-output.txt "%s"'%(self.golden_filename))
+        self.runCmd('process launch -o "%s"'%(self.golden_filename))
         with open(self.golden_filename) as f:
             go = f.read()
 
@@ -173,11 +169,7 @@
 
         # First, capture the golden output emitted by the oracle, i.e., the
         # series of printf statements.
-
-        # process launch command output redirect always goes to host the process is running on
-        self.runCmd('process launch -o /tmp/golden-output.txt')
-        # if this is a remote test, get-file will copy it back over, else it will just copy
-        self.runCmd('platform get-file /tmp/golden-output.txt "%s"'%(self.golden_filename))
+        self.runCmd('process launch -o "%s"'%(self.golden_filename))
         with open(self.golden_filename) as f:
             go = f.read()