dump-images: Execute glretrace from source dir when running uninstalled

Previously, we've had code to carefully find wrappers and scripts
relative to an apitrace binary being run from an uninstalled
directory. This is extremely useful while testing an experimental
feature before installing said experimental code.

Similarly, provide a findProgram function to do the same thing for an
executable program and use it within "apitrace dump-images" when
invoking glretrace.

1 files changed, 5 insertions, 1 deletions

diff --git a/cli/cli_dump_images.cpp b/cli/cli_dump_images.cpp
index d42b3f78..2a856c78 100644
--- a/cli/cli_dump_images.cpp
+++ b/cli/cli_dump_images.cpp
@@ -36,6 +36,8 @@
 #include "os_string.hpp"
 #include "os_process.hpp"
 
+#include "trace_resource.hpp"
+
 static const char *synopsis = "Dump frame images obtained from a trace.";
 
 static void
@@ -123,7 +125,9 @@ command(int argc, char *argv[])
      * already been pulled in for the "apitrace retrace" (or "apitrace
      * replay") command. */
     std::vector<const char *> command;
-    command.push_back("glretrace");
+
+    os::String glretracePath = trace::findProgram("glretrace");
+    command.push_back(glretracePath);
     command.push_back("-s");
     command.push_back(output);
     command.push_back("-S");