Rename argdumper to lldb-argdumper.

[tfiala]

Summary

Distributions that put lldb binaries in /usr/bin and whatnot are going to put argdumper in the same place. argdumper is way too generic a name. Rename to lldb-argdumper, to match our lldb- prefix for lldb executables.

This change fixes the Xcode and cmake builds to use lldb-argdumper as the binary name.

I've tested this patch on OS X 10.11 and Ubuntu 14.04 x86_64.

I will make follow-up changes (after verifying the name change works) to:

• eliminate the dependence on liblldb - that is silly for this binary.
• rename the directory and source file names to match lldb-argdumper.

I'd rather break this into an end-product change (this one) and the file/directory naming change rather than jam those together.

[labath]

Looks good.

argdumper should probably go to /usr/libexec, but then I guess we won't be able to find it, so that's a different story...

[tfiala]

In D14169#277545, @labath wrote:

Looks good.

argdumper should probably go to /usr/libexec, but then I guess we won't be able to find it, so that's a different story...

Exactly right. That will require more work.

[tfiala]

scripts/Python/finish-swig-Python-LLDB.sh

Hmm I think there is a python implementation of this script that I may have missed. Checking on that now.

[tfiala]

In D14169#277587, @tfiala wrote:

scripts/Python/finish-swig-Python-LLDB.sh

Hmm I think there is a python implementation of this script that I may have missed. Checking on that now.

Yes there is. I need to adjust one other place. I'll update the patch.

[tfiala]

Fixed up one missed spot, the python-based class completion script.

I think the original clean build and test run on Linux missed this because I don't think we actually use it on Linux. It's primarily useful on OS X 10.11 and beyond where we cannot launch inferiors through the shell any longer with System Integrity Protection.

In any event, the latest patch fixes up the symbolic link creation within the python module directory on non-OS X systems.

[tfiala]

I'm out the next couple days at the LLVM conference. I'm going to put this in. We'll revert it out if it causes any trouble on Windows and fix it up.

[tfiala]

Closed by commit:

$ svn commit
Sending        lldb.xcodeproj/project.pbxproj
Sending        scripts/Python/finish-swig-Python-LLDB.sh
Sending        scripts/Python/finishSwigPythonLLDB.py
Sending        source/Host/macosx/Host.mm
Sending        source/Host/windows/Host.cpp
Sending        tools/argdumper/CMakeLists.txt
Transmitting file data ......
Committed revision 251616.

lldb.xcodeproj/project.pbxproj

     8CCB018219BA4E270009FD44 /* SBThreadCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 8CCB018119BA4E210009FD44 /* SBThreadCollection.h */; settings = {ATTRIBUTES = (Public, ); }; };
     8CCB018319BA51BF0009FD44 /* SBThreadCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CCB017F19BA4DD00009FD44 /* SBThreadCollection.cpp */; };
     8CF02AE919DCC01900B14BE0 /* InstrumentationRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF02ADF19DCBF3B00B14BE0 /* InstrumentationRuntime.cpp */; };
     8CF02AEA19DCC02100B14BE0 /* AddressSanitizerRuntime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF02AE519DCBF8400B14BE0 /* AddressSanitizerRuntime.cpp */; };
     8CF02AEF19DD16B100B14BE0 /* InstrumentationRuntimeStopInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8CF02AED19DD15CF00B14BE0 /* InstrumentationRuntimeStopInfo.cpp */; };
     94094C6B163B6F840083A547 /* ValueObjectCast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94094C69163B6CD90083A547 /* ValueObjectCast.cpp */; };
     940B02F619DC96E700AD0F52 /* SBExecutionContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 940B02F519DC96E700AD0F52 /* SBExecutionContext.cpp */; };
     940B04D91A8984FF0045D5F7 /* argdumper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 940B04D81A8984FF0045D5F7 /* argdumper.cpp */; };
-    940B04E41A8987680045D5F7 /* argdumper in CopyFiles */ = {isa = PBXBuildFile; fileRef = 942829C01A89835300521B30 /* argdumper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+    940B04E41A8987680045D5F7 /* lldb-argdumper in CopyFiles */ = {isa = PBXBuildFile; fileRef = 942829C01A89835300521B30 /* lldb-argdumper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
     94145431175E63B500284436 /* lldb-versioning.h in Headers */ = {isa = PBXBuildFile; fileRef = 94145430175D7FDE00284436 /* lldb-versioning.h */; settings = {ATTRIBUTES = (Public, ); }; };
     9418EBCD1AA910910058B02E /* VectorType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9418EBCC1AA910910058B02E /* VectorType.cpp */; };
     941BCC7F14E48C4000BB969C /* SBTypeFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9461568614E355F2003A195C /* SBTypeFilter.h */; settings = {ATTRIBUTES = (Public, ); }; };
     941BCC8014E48C4000BB969C /* SBTypeFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 9461568714E355F2003A195C /* SBTypeFormat.h */; settings = {ATTRIBUTES = (Public, ); }; };
     941BCC8114E48C4000BB969C /* SBTypeSummary.h in Headers */ = {isa = PBXBuildFile; fileRef = 9461568814E355F2003A195C /* SBTypeSummary.h */; settings = {ATTRIBUTES = (Public, ); }; };
     941BCC8214E48C4000BB969C /* SBTypeSynthetic.h in Headers */ = {isa = PBXBuildFile; fileRef = 9461568914E355F2003A195C /* SBTypeSynthetic.h */; settings = {ATTRIBUTES = (Public, ); }; };
     94235B9E1A8D667400EB2EED /* SBVariablesOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94235B9B1A8D5FF300EB2EED /* SBVariablesOptions.cpp */; };
     94235B9F1A8D66D600EB2EED /* SBVariablesOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 94235B9A1A8D5FD800EB2EED /* SBVariablesOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };

       runOnlyForDeploymentPostprocessing = 1;
     };
     940B04E31A89875C0045D5F7 /* CopyFiles */ = {
       isa = PBXCopyFilesBuildPhase;
       buildActionMask = 2147483647;
       dstPath = "";
       dstSubfolderSpec = 7;
       files = (
-        940B04E41A8987680045D5F7 /* argdumper in CopyFiles */,
+        940B04E41A8987680045D5F7 /* lldb-argdumper in CopyFiles */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
     942829BE1A89835300521B30 /* CopyFiles */ = {
       isa = PBXCopyFilesBuildPhase;
       buildActionMask = 2147483647;
       dstPath = /usr/share/man/man1/;
       dstSubfolderSpec = 0;

     9418EBCC1AA910910058B02E /* VectorType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VectorType.cpp; path = source/DataFormatters/VectorType.cpp; sourceTree = "<group>"; };
     94235B9A1A8D5FD800EB2EED /* SBVariablesOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBVariablesOptions.h; path = include/lldb/API/SBVariablesOptions.h; sourceTree = "<group>"; };
     94235B9B1A8D5FF300EB2EED /* SBVariablesOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBVariablesOptions.cpp; path = source/API/SBVariablesOptions.cpp; sourceTree = "<group>"; };
     94235B9D1A8D601A00EB2EED /* SBVariablesOptions.i */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c.preprocessed; path = SBVariablesOptions.i; sourceTree = "<group>"; };
     942612F51B94FFE900EF842E /* LanguageCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LanguageCategory.h; path = include/lldb/DataFormatters/LanguageCategory.h; sourceTree = "<group>"; };
     942612F61B95000000EF842E /* LanguageCategory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LanguageCategory.cpp; path = source/DataFormatters/LanguageCategory.cpp; sourceTree = "<group>"; };
     942829541A89614000521B30 /* JSON.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JSON.h; path = include/lldb/Utility/JSON.h; sourceTree = "<group>"; };
     942829551A89614C00521B30 /* JSON.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JSON.cpp; path = source/Utility/JSON.cpp; sourceTree = "<group>"; };
-    942829C01A89835300521B30 /* argdumper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = argdumper; sourceTree = BUILT_PRODUCTS_DIR; };
+    942829C01A89835300521B30 /* lldb-argdumper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-argdumper"; sourceTree = BUILT_PRODUCTS_DIR; };
     94380B8019940B0300BFE4A8 /* StringLexer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StringLexer.h; path = include/lldb/Utility/StringLexer.h; sourceTree = "<group>"; };
     94380B8119940B0A00BFE4A8 /* StringLexer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringLexer.cpp; path = source/Utility/StringLexer.cpp; sourceTree = "<group>"; };
     943B90FC1B991586007BA499 /* VectorIterator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = VectorIterator.h; path = include/lldb/DataFormatters/VectorIterator.h; sourceTree = "<group>"; };
     943BDEFC1AA7B2DE00789CE8 /* LLDBAssert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LLDBAssert.h; path = include/lldb/Utility/LLDBAssert.h; sourceTree = "<group>"; };
     943BDEFD1AA7B2F800789CE8 /* LLDBAssert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LLDBAssert.cpp; path = source/Utility/LLDBAssert.cpp; sourceTree = "<group>"; };
     944372DA171F6B4300E57C32 /* RegisterContextDummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterContextDummy.cpp; path = Utility/RegisterContextDummy.cpp; sourceTree = "<group>"; };
     944372DB171F6B4300E57C32 /* RegisterContextDummy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterContextDummy.h; path = Utility/RegisterContextDummy.h; sourceTree = "<group>"; };
     9443B120140C18A90013457C /* SBData.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SBData.h; path = include/lldb/API/SBData.h; sourceTree = "<group>"; };

     1AB674ADFE9D54B511CA2CBB /* Products */ = {
       isa = PBXGroup;
       children = (
         26F5C26A10F3D9A4009D5894 /* lldb */,
         26680207115FD0ED008E1FE4 /* LLDB.framework */,
         26579F68126A25920007C5CB /* darwin-debug */,
         26DC6A101337FE6900FF7998 /* lldb-server */,
         2690CD171A6DC0D000E717C8 /* lldb-mi */,
-        942829C01A89835300521B30 /* argdumper */,
+        942829C01A89835300521B30 /* lldb-argdumper */,
         239504D41BDD451400963CEA /* lldb-gtest */,
       );
       name = Products;
       sourceTree = "<group>";
       usesTabs = 0;
     };
     23042D0F1976C9D800621B2C /* Kalimba */ = {
       isa = PBXGroup;

       dependencies = (
         266803621160110D008E1FE4 /* PBXTargetDependency */,
       );
       name = "lldb-tool";
       productName = lldb;
       productReference = 26F5C26A10F3D9A4009D5894 /* lldb */;
       productType = "com.apple.product-type.tool";
     };
-    942829BF1A89835300521B30 /* argdumper */ = {
+    942829BF1A89835300521B30 /* lldb-argdumper */ = {
       isa = PBXNativeTarget;
-      buildConfigurationList = 942829C41A89835400521B30 /* Build configuration list for PBXNativeTarget "argdumper" */;
+      buildConfigurationList = 942829C41A89835400521B30 /* Build configuration list for PBXNativeTarget "lldb-argdumper" */;
       buildPhases = (
         942829BC1A89835300521B30 /* Sources */,
         942829BD1A89835300521B30 /* Frameworks */,
         942829BE1A89835300521B30 /* CopyFiles */,
         940B04E21A89871F0045D5F7 /* ShellScript */,
       );
       buildRules = (
       );
       dependencies = (
         942829CA1A89836A00521B30 /* PBXTargetDependency */,
       );
-      name = argdumper;
+      name = "lldb-argdumper";
       productName = argdumper;
-      productReference = 942829C01A89835300521B30 /* argdumper */;
+      productReference = 942829C01A89835300521B30 /* lldb-argdumper */;
       productType = "com.apple.product-type.tool";
     };
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
     08FB7793FE84155DC02AAC07 /* Project object */ = {
       isa = PBXProject;
       attributes = {

         26680206115FD0ED008E1FE4 /* LLDB */,
         26579F67126A25920007C5CB /* darwin-debug */,
         2689FFC913353D7A00698AC0 /* lldb-core */,
         26DC6A0F1337FE6900FF7998 /* lldb-server */,
         2687EAC51508110B00DD8C2E /* install-headers */,
         235AFBB5199BC6AD00897A4B /* Linux */,
         235AFBBB199BC6FD00897A4B /* MacOSX and Linux */,
         2690CD161A6DC0D000E717C8 /* lldb-mi */,
-        942829BF1A89835300521B30 /* argdumper */,
+        942829BF1A89835300521B30 /* lldb-argdumper */,
         239504D31BDD451400963CEA /* lldb-gtest */,
       );
     };
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
     239504C51BDD3FD700963CEA /* debugserver */ = {
       isa = PBXReferenceProxy;

     };
     942829CA1A89836A00521B30 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 2689FFC913353D7A00698AC0 /* lldb-core */;
       targetProxy = 942829C91A89836A00521B30 /* PBXContainerItemProxy */;
     };
     942829CE1A89842900521B30 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
-      target = 942829BF1A89835300521B30 /* argdumper */;
+      target = 942829BF1A89835300521B30 /* lldb-argdumper */;
       targetProxy = 942829CD1A89842900521B30 /* PBXContainerItemProxy */;
     };
     94E829C9152D33B4006F96A3 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 26DC6A0F1337FE6900FF7998 /* lldb-server */;
       targetProxy = 94E829C8152D33B4006F96A3 /* PBXContainerItemProxy */;
     };
 /* End PBXTargetDependency section */

         26F5C26C10F3D9A5009D5894 /* Debug */,
         49BB8F381611172B00BDD462 /* DebugClang */,
         26F5C26D10F3D9A5009D5894 /* Release */,
         268A89B311963ECA00D953EB /* BuildAndIntegration */,
       );
       defaultConfigurationIsVisible = 0;
       defaultConfigurationName = BuildAndIntegration;
     };
-    942829C41A89835400521B30 /* Build configuration list for PBXNativeTarget "argdumper" */ = {
+    942829C41A89835400521B30 /* Build configuration list for PBXNativeTarget "lldb-argdumper" */ = {
       isa = XCConfigurationList;
       buildConfigurations = (
         942829C51A89835400521B30 /* Debug */,
         942829C61A89835400521B30 /* DebugClang */,
         942829C71A89835400521B30 /* Release */,
         942829C81A89835400521B30 /* BuildAndIntegration */,
       );
       defaultConfigurationIsVisible = 0;
       defaultConfigurationName = BuildAndIntegration;
     };
 /* End XCConfigurationList section */
   };
   rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
 }

scripts/Python/finish-swig-Python-LLDB.sh

     else
         if [ $Debug -eq 1 ]
         then
             echo "${framework_python_dir}/darwin-debug already exists."
         fi
     fi
 fi
 
-# Make symlink for argdumper on any platform
+# Make symlink for lldb-argdumper on any platform
 if [ $MakefileCalled -ne 0 ]
 then
     # We are being built by CMake
 
-    if [ ! -L "${framework_python_dir}/argdumper" ]
+    if [ ! -L "${framework_python_dir}/lldb-argdumper" ]
     then
         if [ $Debug -eq 1 ]
         then
-            echo "Creating symlink for argdumper"
+            echo "Creating symlink for lldb-argdumper"
         fi
         cd "${framework_python_dir}"
-        ln -s "../../../../bin/argdumper" argdumper
+        ln -s "../../../../bin/lldb-argdumper" lldb-argdumper
     else
         if [ $Debug -eq 1 ]
         then
-            echo "${framework_python_dir}/argdumper already exists."
+            echo "${framework_python_dir}/lldb-argdumper already exists."
         fi
     fi
 fi
 
 create_python_package () {
     package_dir="${framework_python_dir}$1"
     package_files="$2"
     package_name=`echo $1 | tr '/' '.'`

scripts/Python/finishSwigPythonLLDB.py

     else:
         strSrc = os.path.join("bin", "lldb-launcher");
 
     bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
 
     return (bOk, strErrMsg);
 
 #++---------------------------------------------------------------------------
-# Details:  Make the symbolic link to the argdumper.
+# Details:  Make the symbolic link to the lldb-argdumper.
 # Args:     vDictArgs               - (R) Program input parameters.
 #           vstrFrameworkPythonDir  - (R) Python framework directory.
-#           vstrArgdumperFileName   - (R) File name for argdumper.
+#           vstrArgdumperFileName   - (R) File name for lldb-argdumper.
 # Returns:  Bool - True = function success, False = failure.
 #           Str - Error description on task failure.
 # Throws:   None.
 #--
-def make_symlink_argdumper( vDictArgs, vstrFrameworkPythonDir, vstrArgdumperFileName ):
-    dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_argdumper()" );
+def make_symlink_lldb_argdumper( vDictArgs, vstrFrameworkPythonDir, vstrArgdumperFileName ):
+    dbg = utilsDebug.CDebugFnVerbose( "Python script make_symlink_lldb_argdumper()" );
     bOk = True;
     strErrMsg = "";
     strTarget = vstrArgdumperFileName;
     strSrc = "";
 
     eOSType = utilsOsType.determine_os_type();
     if eOSType == utilsOsType.EnumOsType.Windows:
         strTarget += ".exe";
 
     bMakeFileCalled = "-m" in vDictArgs;
     if not bMakeFileCalled:
         return (bOk, strErrMsg);
     else:
         strExeFileExtn = "";
         if eOSType == utilsOsType.EnumOsType.Windows:
             strExeFileExtn = ".exe";
-        strSrc = os.path.join("bin", "argdumper" + strExeFileExtn);
+        strSrc = os.path.join("bin", "lldb-argdumper" + strExeFileExtn);
 
     bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
 
     return (bOk, strErrMsg);
 
 #++---------------------------------------------------------------------------
 # Details:  Make the symlink that the script bridge for Python will need in
 #           the Python framework directory.

 
     # Make symlink for darwin-debug on Darwin
     strDarwinDebugFileName = "darwin-debug"
     if bOk and eOSType == utilsOsType.EnumOsType.Darwin:
         bOk, strErrMsg = make_symlink_darwin_debug( vDictArgs,
                                                     vstrFrameworkPythonDir,
                                                     strDarwinDebugFileName );
 
-    # Make symlink for argdumper
-    strArgdumperFileName = "argdumper"
+    # Make symlink for lldb-argdumper
+    strArgdumperFileName = "lldb-argdumper"
     if bOk:
-        bOk, strErrMsg = make_symlink_argdumper( vDictArgs,
+        bOk, strErrMsg = make_symlink_lldb_argdumper( vDictArgs,
                                                  vstrFrameworkPythonDir,
                                                  strArgdumperFileName );
 
     return (bOk, strErrMsg);
 
 #++---------------------------------------------------------------------------
 # Details:  Look for the directory in which to put the Python files; if it
 #           does not already exist, attempt to make it.

source/Host/macosx/Host.mm

 Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
 {
     Error error;
     if (launch_info.GetFlags().Test(eLaunchFlagShellExpandArguments))
     {
         FileSpec expand_tool_spec;
         if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, expand_tool_spec))
         {
-            error.SetErrorString("could not get support executable directory for argdumper tool");
+            error.SetErrorString("could not get support executable directory for lldb-argdumper tool");
             return error;
         }
-        expand_tool_spec.AppendPathComponent("argdumper");
+        expand_tool_spec.AppendPathComponent("lldb-argdumper");
         if (!expand_tool_spec.Exists())
         {
-            error.SetErrorStringWithFormat("could not find argdumper tool: %s", expand_tool_spec.GetPath().c_str());
+            error.SetErrorStringWithFormat("could not find the lldb-argdumper tool: %s", expand_tool_spec.GetPath().c_str());
             return error;
         }
 
         Args expand_command(expand_tool_spec.GetPath().c_str());
         expand_command.AppendArguments (launch_info.GetArguments());
         
         int status;
         std::string output;
         RunShellCommand(expand_command, launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10);
         
         if (status != 0)
         {
-            error.SetErrorStringWithFormat("argdumper exited with error %d", status);
+            error.SetErrorStringWithFormat("lldb-argdumper exited with error %d", status);
             return error;
         }
         
         auto data_sp = StructuredData::ParseJSON(output);
         if (!data_sp)
         {
             error.SetErrorString("invalid JSON");
             return error;

source/Host/windows/Host.cpp

 Host::ShellExpandArguments (ProcessLaunchInfo &launch_info)
 {
     Error error;
     if (launch_info.GetFlags().Test(eLaunchFlagShellExpandArguments))
     {
         FileSpec expand_tool_spec;
         if (!HostInfo::GetLLDBPath(lldb::ePathTypeSupportExecutableDir, expand_tool_spec))
         {
-            error.SetErrorString("could not find argdumper tool");
+            error.SetErrorString("could not find support executable directory for the lldb-argdumper tool");
             return error;
         }
-        expand_tool_spec.AppendPathComponent("argdumper.exe");
+        expand_tool_spec.AppendPathComponent("lldb-argdumper.exe");
         if (!expand_tool_spec.Exists())
         {
-            error.SetErrorString("could not find argdumper tool");
+            error.SetErrorString("could not find the lldb-argdumper tool");
             return error;
         }
         
         std::string quoted_cmd_string;
         launch_info.GetArguments().GetQuotedCommandString(quoted_cmd_string);
         std::replace(quoted_cmd_string.begin(), quoted_cmd_string.end(), '\\', '/');
         StreamString expand_command;
         
         expand_command.Printf("%s %s",
                               expand_tool_spec.GetPath().c_str(),
                               quoted_cmd_string.c_str());
         
         int status;
         std::string output;
         RunShellCommand(expand_command.GetData(), launch_info.GetWorkingDirectory(), &status, nullptr, &output, 10);
         
         if (status != 0)
         {
-            error.SetErrorStringWithFormat("argdumper exited with error %d", status);
+            error.SetErrorStringWithFormat("lldb-argdumper exited with error %d", status);
             return error;
         }
         
         auto data_sp = StructuredData::ParseJSON(output);
         if (!data_sp)
         {
             error.SetErrorString("invalid JSON");
             return error;

tools/argdumper/CMakeLists.txt

-add_lldb_executable(argdumper
+add_lldb_executable(lldb-argdumper
   argdumper.cpp
   )
 
-target_link_libraries(argdumper liblldb)
+target_link_libraries(lldb-argdumper liblldb)
 
-install(TARGETS argdumper
+install(TARGETS lldb-argdumper
   RUNTIME DESTINATION bin)