From e41df7e91baeb36594fea8bc71ee5f5c4a36143d Mon Sep 17 00:00:00 2001
From: Christopher Dykes <cdykes@fb.com>
Date: Sat, 3 Jun 2017 20:10:38 -0700
Subject: [PATCH 1/1] Don't use folly::shellify in StaticTracepointTest

Summary: It's deprecated, so use the non-deprecated form instead.

Reviewed By: yfeldblum

Differential Revision: D5179133

fbshipit-source-id: 91440bc3768ee68d2aada2299fbfbcdd852f946c
---
 folly/tracing/test/StaticTracepointTest.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/folly/tracing/test/StaticTracepointTest.cpp b/folly/tracing/test/StaticTracepointTest.cpp
index 710c565c..d6b76ec8 100644
--- a/folly/tracing/test/StaticTracepointTest.cpp
+++ b/folly/tracing/test/StaticTracepointTest.cpp
@@ -26,7 +26,6 @@
 #include <folly/Conv.h>
 #include <folly/Format.h>
 #include <folly/Random.h>
-#include <folly/Shell.h>
 #include <folly/String.h>
 #include <folly/Subprocess.h>
 #include <folly/portability/GTest.h>
@@ -92,14 +91,14 @@ static std::string getExe() {
 }
 
 static std::string getNoteRawContent(const std::string& fileName) {
-  auto args = folly::shellify(
-      "objdump --{} --{}={} {}",
-      "full-content",
-      "section",
-      ".note." + kUSDTSubsectionName,
-      fileName);
-  auto subProc =
-      folly::Subprocess(args, folly::Subprocess::Options().pipeStdout());
+  auto subProc = folly::Subprocess(
+      std::vector<std::string>{
+          "objdump",
+          "--full-content",
+          "--section=.note." + kUSDTSubsectionName,
+          fileName,
+      },
+      folly::Subprocess::Options().pipeStdout().usePath());
   auto output = subProc.communicate();
   auto retCode = subProc.wait();
   CHECK(retCode.exited());
-- 
2.34.1