ARROW-14554: [C++][CI] Fix OSS-Fuzz build failure

ci/conda_env_cpp.txt

@@ -26,7 +26,7 @@ gflags
 glog
 gmock>=1.10.0
 grpc-cpp>=1.27.3
-gtest=1.10.0
+gtest>=1.10.0
 libprotobuf
 libutf8proc
 lz4-c

ci/docker/conda-cpp.dockerfile

@@ -48,6 +48,7 @@ ENV ARROW_BUILD_TESTS=ON \
     ARROW_WITH_SNAPPY=ON \
     ARROW_WITH_ZLIB=ON \
     ARROW_WITH_ZSTD=ON \
+    GTest_SOURCE=BUNDLED \
     PARQUET_BUILD_EXAMPLES=ON \
     PARQUET_BUILD_EXECUTABLES=ON \
     PARQUET_HOME=$CONDA_PREFIX

cpp/src/arrow/testing/random_test.cc

@@ -35,9 +35,16 @@ namespace random {
 // Use short arrays since especially in debug mode, generating list(list()) is slow
 constexpr int64_t kExpectedLength = 24;
 
-class RandomArrayTest : public ::testing::TestWithParam<std::shared_ptr<Field>> {
+struct RandomTestParam {
+  RandomTestParam(std::shared_ptr<Field> field)  // NOLINT runtime/explicit
+      : field(std::move(field)) {}
+
+  std::shared_ptr<Field> field;
+};
+
+class RandomArrayTest : public ::testing::TestWithParam<RandomTestParam> {
  protected:
-  std::shared_ptr<Field> GetField() { return GetParam(); }
+  std::shared_ptr<Field> GetField() { return GetParam().field; }
 };
 
 TEST_P(RandomArrayTest, GenerateArray) {
@@ -144,7 +151,7 @@ auto values = ::testing::Values(
 INSTANTIATE_TEST_SUITE_P(
     TestRandomArrayGeneration, RandomArrayTest, values,
     [](const ::testing::TestParamInfo<RandomArrayTest::ParamType>& info) {
-      return std::to_string(info.index) + info.param->name();
+      return std::to_string(info.index) + info.param.field->name();
     });
 
 template <typename T>

cpp/thirdparty/versions.txt

@@ -53,8 +53,8 @@ ARROW_GOOGLE_CLOUD_CPP_BUILD_VERSION=v1.31.1
 ARROW_GOOGLE_CLOUD_CPP_BUILD_SHA256_CHECKSUM=dc7cbf95b506a84b48cf71e0462985d262183edeaabdacaaee2109852394a609
 ARROW_GRPC_BUILD_VERSION=v1.35.0
 ARROW_GRPC_BUILD_SHA256_CHECKSUM=27dd2fc5c9809ddcde8eb6fa1fa278a3486566dfc28335fca13eb8df8bd3b958
-ARROW_GTEST_BUILD_VERSION=1.10.0
-ARROW_GTEST_BUILD_SHA256_CHECKSUM=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
+ARROW_GTEST_BUILD_VERSION=1.11.0
+ARROW_GTEST_BUILD_SHA256_CHECKSUM=b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
 ARROW_JEMALLOC_BUILD_VERSION=5.2.1
 ARROW_JEMALLOC_BUILD_SHA256_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6
 ARROW_LZ4_BUILD_VERSION=v1.9.3

dev/release/verify-release-candidate.bat

@@ -88,17 +88,10 @@ cmake -G "%GENERATOR%" ^
       -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
       -DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
       -DCMAKE_UNITY_BUILD=ON ^
-      -DGTest_SOURCE=BUNDLED ^
       ..  || exit /B
 
 cmake --build . --target INSTALL --config Release || exit /B 1
 
-@rem NOTE(wesm): Building googletest is flaky for me with ninja. Building it
-@rem first fixes the problem
-
-@rem ninja googletest_ep || exit /B 1
-@rem ninja install || exit /B 1
-
 @rem Get testing datasets for Parquet unit tests
 git clone https://github.com/apache/parquet-testing.git %_VERIFICATION_DIR%\parquet-testing
 set PARQUET_TEST_DATA=%_VERIFICATION_DIR%\parquet-testing\data

.github/workflows/cpp_cron.yml → dev/tasks/fuzz-tests/github.oss-fuzz.yml

@@ -1,4 +1,3 @@
-
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -16,70 +15,50 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: C++ Cron
-
-on:
-  push:
-    paths:
-      - '.github/workflows/cpp_cron.yml'
-  pull_request:
-    paths:
-      - '.github/workflows/cpp_cron.yml'
-  schedule:
-    - cron: |
-        0 */12 * * *
+{% import 'macros.jinja' as macros with context %}
 
-env:
-  ARROW_ENABLE_TIMING_TESTS: OFF
-  DOCKER_VOLUME_PREFIX: ".docker/"
-  ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
-  ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+{{ macros.github_header() }}
 
 jobs:
-
-  oss-fuzz:
-    name: OSS-Fuzz build check
+  test:
+    name: OSS-Fuzz build test
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.pull_request.title, 'WIP') && github.repository == 'apache/arrow' }}
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        ubuntu: [18.04]
+  {% if env is defined %}
+    env:
+    {% for key, value in env.items() %}
+      {{ key }}: "{{ value }}"
+    {% endfor %}
+  {% endif %}
     steps:
-      - name: Checkout Arrow
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Fetch Submodules and Tags
-        shell: bash
-        run: ci/scripts/util_checkout.sh
+      {{ macros.github_checkout_arrow()|indent }}
+
+      - name: Checkout OSS-Fuzz
+        # (not using the dedicated Action for this as its checkout
+        #  location choice is relatively obscure)
+        run: |
+          git clone --depth=50 https://github.com/google/oss-fuzz.git
+
       - name: Free Up Disk Space
         shell: bash
-        run: ci/scripts/util_cleanup.sh
-      - name: Checkout OSS-Fuzz
-        uses: actions/checkout@v1
-        with:
-          path: oss-fuzz
-          repository: google/oss-fuzz
-          ref: master
+        run: arrow/ci/scripts/util_cleanup.sh
+
       - name: Install dependencies
-        working-directory: ../oss-fuzz
+        working-directory: oss-fuzz
         run: |
           python3 -m pip install setuptools
           python3 -m pip install -r infra/ci/requirements.txt
+
       - name: Build image
-        shell: bash
-        working-directory: ../oss-fuzz
+        working-directory: oss-fuzz
         run: |
           python3 infra/helper.py build_image --pull arrow
+
       - name: Build fuzzers
-        shell: bash
-        working-directory: ../oss-fuzz
+        working-directory: oss-fuzz
         run: |
           python3 infra/helper.py build_fuzzers arrow `pwd`/../arrow
+
       - name: Check build
-        shell: bash
-        working-directory: ../oss-fuzz
+        working-directory: oss-fuzz
         run: |
           python3 infra/helper.py check_build arrow

dev/tasks/tasks.yml

@@ -104,6 +104,9 @@ groups:
   example-cpp:
     - example-*cpp*
 
+  fuzz:
+    - test-*fuzz*
+
   verify-rc:
     - verify-rc-*
 
@@ -1185,6 +1188,13 @@ tasks:
     params:
       run: ubuntu-docs
 
+  ############################## Fuzz tests #################################
+
+  test-build-cpp-fuzz:
+    ci: github
+    template: fuzz-tests/github.oss-fuzz.yml
+
+
   ############################## vcpkg tests ##################################
 
   test-build-vcpkg-win: