Use git master gflags to avoid valgrind error

Change-Id: Ib36148918bc08435e40edea4f6823c038c8c7075

Author: wesm

cpp/CMakeLists.txt

@@ -518,15 +518,16 @@ if(ARROW_BUILD_TESTS)
 
     set(GFLAGS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gflags_ep-prefix/src/gflags_ep")
     ExternalProject_Add(gflags_ep
-      URL "https://github.com/gflags/gflags/archive/v${GFLAGS_VERSION}.tar.gz"
+      GIT_REPOSITORY https://github.com/gflags/gflags.git
+      GIT_TAG cce68f0c9c5d054017425e6e6fd54f696d36e8ee
+      # URL "https://github.com/gflags/gflags/archive/v${GFLAGS_VERSION}.tar.gz"
       BUILD_IN_SOURCE 1
       CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
                  -DCMAKE_INSTALL_PREFIX=${GFLAGS_PREFIX}
                  -DBUILD_SHARED_LIBS=OFF
                  -DBUILD_STATIC_LIBS=ON
                  -DBUILD_PACKAGING=OFF
                  -DBUILD_TESTING=OFF
-                 -DBUILD_NC_TESTS=OFF
                  -BUILD_CONFIG_TESTS=OFF
                  -DINSTALL_HEADERS=ON
                  -DCMAKE_CXX_FLAGS=${GFLAGS_CMAKE_CXX_FLAGS})

cpp/src/arrow/ipc/json-integration-test.cc

@@ -148,9 +148,7 @@ static Status ValidateArrowVsJson(
        << "Arrow schema: \n"
        << arrow_schema->ToString();
 
-    if (FLAGS_verbose) {
-      std::cout << ss.str() << std::endl;
-    }
+    if (FLAGS_verbose) { std::cout << ss.str() << std::endl; }
     return Status::Invalid("Schemas did not match");
   }
 
@@ -233,8 +231,8 @@ class TestJSONIntegration : public ::testing::Test {
     do {
       std::shared_ptr<io::FileOutputStream> out;
       RETURN_NOT_OK(io::FileOutputStream::Open(path, &out));
-      RETURN_NOT_OK(out->Write(reinterpret_cast<const uint8_t*>(data),
-              static_cast<int64_t>(strlen(data))));
+      RETURN_NOT_OK(out->Write(
+          reinterpret_cast<const uint8_t*>(data), static_cast<int64_t>(strlen(data))));
     } while (0);
     return Status::OK();
   }
@@ -366,15 +364,18 @@ TEST_F(TestJSONIntegration, ErrorStates) {
 int main(int argc, char** argv) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
+  int ret = 0;
+
   if (FLAGS_integration) {
     arrow::Status result = arrow::RunCommand(FLAGS_json, FLAGS_arrow, FLAGS_mode);
     if (!result.ok()) {
       std::cout << "Error message: " << result.ToString() << std::endl;
-      return 1;
+      ret = 1;
     }
   } else {
     ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
+    ret = RUN_ALL_TESTS();
   }
-  return 0;
+  gflags::ShutDownCommandLineFlags();
+  return ret;
 }