From 1ec6f26ce77dc228655f29b94413f35a0d008fcb Mon Sep 17 00:00:00 2001
From: zhangskz <89936743+zhangskz@users.noreply.github.com>
Date: Tue, 31 May 2022 20:45:44 +0000
Subject: [PATCH] =?UTF-8?q?Remove=20expected=20cmake=20failure=20due=20to?=
 =?UTF-8?q?=20missing=20abseil=20sources,=20since=20ab=E2=80=A6=20(#10089)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove expected cmake failure due to missing abseil sources, since absl dep was rolled back

* Add back cmake.sh run using extracted sources
---
 kokoro/linux/cmake_distcheck/build.sh | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/kokoro/linux/cmake_distcheck/build.sh b/kokoro/linux/cmake_distcheck/build.sh
index 5e957f8a5..116e40b86 100755
--- a/kokoro/linux/cmake_distcheck/build.sh
+++ b/kokoro/linux/cmake_distcheck/build.sh
@@ -52,15 +52,9 @@ tar -C ${DIST_WORK_ROOT} --strip-components=1 -axf ${DIST_ARCHIVE}
 #
 # Run tests using extracted sources
 #
-if SOURCE_DIR=${DIST_WORK_ROOT} \
-  CMAKE_GENERATOR=Ninja \
-  CTEST_PARALLEL_LEVEL=$(nproc) \
-  kokoro/common/cmake.sh; then
-  # TODO: remove this conditional.
-  # The cmake build is expected to fail due to missing abseil sources.
-  echo "$0: Expected failure, but build passed." >&2
-  echo "Please update $(basename $0) to remove failure expectation." >&2
-  echo "FAIL" >&2
-  exit 1
-fi
+SOURCE_DIR=${DIST_WORK_ROOT} \
+CMAKE_GENERATOR=Ninja \
+CTEST_PARALLEL_LEVEL=$(nproc) \
+kokoro/common/cmake.sh
+
 echo "PASS"