Mac OSS CI use cmake built gtest

.ci/scripts/setup-macos.sh

@@ -77,16 +77,11 @@ install_sccache() {
 
   export PATH="${SCCACHE_PATH}:${PATH}"
 
-  # Create temp directory for sccache shims
-  TMP_DIR=$(mktemp -d)
-  trap 'rm -rfv ${TMP_DIR}' EXIT
-
   write_sccache_stub "${TMP_DIR}/c++"
   write_sccache_stub "${TMP_DIR}/cc"
   write_sccache_stub "${TMP_DIR}/clang++"
   write_sccache_stub "${TMP_DIR}/clang"
 
-  export PATH="${TMP_DIR}:$PATH"
   sccache --zero-stats || true
 }
 

.github/workflows/_unittest.yml

@@ -41,10 +41,6 @@ jobs:
 
   macos:
     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
-    strategy:
-      matrix:
-        include:
-          - build-tool: buck2
     with:
       runner: macos-m1-stable
       python-version: '3.11'
@@ -53,18 +49,21 @@ jobs:
       script: |
         set -eux
 
-        BUILD_TOOL=${{ matrix.build-tool }}
-
         bash .ci/scripts/setup-conda.sh
 
+        # Create temp directory for sccache shims
+        export TMP_DIR=$(mktemp -d)
+        export PATH="${TMP_DIR}:$PATH"
+        trap 'rm -rfv ${TMP_DIR}' EXIT
+
         # Setup MacOS dependencies as there is no Docker support on MacOS atm
         PYTHON_EXECUTABLE=python \
         EXECUTORCH_BUILD_PYBIND=ON \
         CMAKE_ARGS="-DEXECUTORCH_BUILD_COREML=ON -DEXECUTORCH_BUILD_MPS=ON -DEXECUTORCH_BUILD_XNNPACK=ON -DEXECUTORCH_BUILD_KERNELS_QUANTIZED=ON" \
         ${CONDA_RUN} --no-capture-output \
-        .ci/scripts/setup-macos.sh "${BUILD_TOOL}"
+        .ci/scripts/setup-macos.sh cmake
 
         # Run pytest with coverage
         ${CONDA_RUN} pytest -n auto --cov=./ --cov-report=xml
         # Run gtest
-        ${CONDA_RUN} buck2 test runtime/core/... runtime/platform/...
+        ${CONDA_RUN} test/run_oss_cpp_tests.sh

test/run_oss_cpp_tests.sh

@@ -17,15 +17,26 @@ set -ex
 build_executorch() {
   cmake . \
     -DCMAKE_INSTALL_PREFIX=cmake-out \
-    -DEXECUTORCH_BUILD_GTESTS=ON \
     -DEXECUTORCH_BUILD_EXTENSION_DATA_LOADER=ON \
     -Bcmake-out
   cmake --build cmake-out -j9 --target install
 }
 
+build_gtest() {
+  mkdir -p third-party/googletest/build
+  pushd third-party/googletest/build
+  cmake .. -DCMAKE_INSTALL_PREFIX=.
+  make -j4
+  make install
+  popd
+}
+
 build_and_run_test() {
   local test_dir=$1
-  cmake "${test_dir}" -Bcmake-out/"${test_dir}" -DCMAKE_INSTALL_PREFIX=cmake-out
+  cmake "${test_dir}" \
+    -DCMAKE_INSTALL_PREFIX=cmake-out \
+    -DCMAKE_PREFIX_PATH="$(pwd)/third-party/googletest/build" \
+    -Bcmake-out/"${test_dir}"
   cmake --build cmake-out/"${test_dir}" -j9
 
   for t in cmake-out/"${test_dir}"/*test; do
@@ -56,6 +67,7 @@ probe_tests() {
 }
 
 build_executorch
+build_gtest
 
 if [ -z "$1" ]; then
   echo "Running all directories:"