Build integration test as a normal unit test executable, opt-in to integration testing

Change-Id: I5cad36511c88dd7d6b8a05d4f58d8ee98da35e3f

Author: wesm

ci/travis_script_cpp.sh

@@ -34,7 +34,4 @@ make lint
 
 ctest -VV -L unittest
 
-# Also run the integration tests self tests
-debug/json-integration-test --unittest --verbose
-
 popd

cpp/src/arrow/ipc/CMakeLists.txt

@@ -85,7 +85,7 @@ ADD_ARROW_TEST(ipc-json-test)
 ARROW_TEST_LINK_LIBRARIES(ipc-json-test
   ${ARROW_IPC_TEST_LINK_LIBS})
 
-add_executable(json-integration-test json-integration-test.cc)
+ADD_ARROW_TEST(json-integration-test)
 
 if (APPLE)
   target_link_libraries(json-integration-test

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

@@ -40,8 +40,8 @@ DEFINE_string(arrow, "", "Arrow file name");
 DEFINE_string(json, "", "JSON file name");
 DEFINE_string(mode, "VALIDATE",
     "Mode of integration testing tool (ARROW_TO_JSON, JSON_TO_ARROW, VALIDATE)");
-DEFINE_bool(unittest, false, "Run integration test self unit tests");
-DEFINE_bool(verbose, false, "Verbose output");
+DEFINE_bool(integration, false, "Run in integration test mode");
+DEFINE_bool(verbose, true, "Verbose output");
 
 namespace fs = boost::filesystem;
 
@@ -366,16 +366,15 @@ TEST_F(TestJSONIntegration, ErrorStates) {
 int main(int argc, char** argv) {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
-  if (FLAGS_unittest) {
+  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;
+    }
+  } else {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();
   }
-
-  arrow::Status result = arrow::RunCommand(FLAGS_json, FLAGS_arrow, FLAGS_mode);
-  if (!result.ok()) {
-    std::cout << "Error message: " << result.ToString() << std::endl;
-    return 1;
-  }
-
   return 0;
 }