commit d767889a2b2f63bb2dcbcf63625d809ceaae8182
author James Tucker <raggi@google.com> Mon Feb 11 23:08:33 2019 -0800
committer James Tucker <raggi@google.com> Tue Feb 12 07:52:37 2019 +0000
tree 934503e157c62d09df7bfea9adb58bb817a7e51d
parent 85b0a8bc495504b1d93d0e93e0cbf7183cf389f4

[catapult_converter] make it a shell command

A shell command is required to invoke this program inside a shell environment
that does not share a library ABI intersection with the binaries
dependencies.

Test: manual invocation of benchmarks.sh
Change-Id: I990c6d8d01c62daab7e6cc38e76563af70507bd7

garnet/bin/catapult_converter/BUILD.gn

diff --git a/garnet/bin/catapult_converter/BUILD.gn b/garnet/bin/catapult_converter/BUILD.gn
index 74bd2607..2c8276c 100644
--- a/garnet/bin/catapult_converter/BUILD.gn
+++ b/garnet/bin/catapult_converter/BUILD.gn
@@ -57,7 +57,12 @@
     },
   ]
 
-  binary = "catapult_converter"
+  binaries = [
+    {
+      name = "catapult_converter"
+      shell = true
+    },
+  ]
 
   tests = [
     {

garnet/testing/runbenchmarks/runbenchmarks.sh

diff --git a/garnet/testing/runbenchmarks/runbenchmarks.sh b/garnet/testing/runbenchmarks/runbenchmarks.sh
index cd06819..efca00f 100644
--- a/garnet/testing/runbenchmarks/runbenchmarks.sh
+++ b/garnet/testing/runbenchmarks/runbenchmarks.sh
@@ -117,7 +117,7 @@
     # Convert the results file to a Catapult Histogram JSON file.
     local base_name="$(basename ${results_file} .json).catapult_json"
     local catapult_file="$(dirname ${results_file})/$base_name"
-    /pkgfs/packages/catapult_converter/0/bin/app \
+    /bin/catapult_converter \
         --input ${results_file} \
         --output ${catapult_file} \
         ${_catapult_converter_args}