From 2b9d022b85be2e3938a6fda0949d648f2cc49d91 Mon Sep 17 00:00:00 2001 From: OpenJDK Team Date: Tue, 30 Jul 2024 08:42:49 +0200 Subject: [PATCH] googletest-version Gbp-Pq: Name googletest-version.diff --- make/autoconf/lib-tests.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4 index 647e45dd4..848fb3906 100644 --- a/make/autoconf/lib-tests.m4 +++ b/make/autoconf/lib-tests.m4 @@ -64,16 +64,17 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_GTEST], # determined. :-( Instead, there are different, incorrect version # numbers we can look for. GTEST_VERSION_1="`$GREP GOOGLETEST_VERSION $GTEST_FRAMEWORK_SRC/CMakeLists.txt | $SED -E -e 's/set\(GOOGLETEST_VERSION (.*)\)/\1/'`" - if test "x$GTEST_VERSION_1" != "x1.9.0"; then - AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.8.1]) + if test "x$GTEST_VERSION_1" != "x1.14.0"; then + AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.14.0]) fi + # $GTEST_FRAMEWORK_SRC/configure.ac does not exist # We cannot grep for "AC_IN*T" as a literal since then m4 will treat it as a macro # and expand it. # Additional [] needed to keep m4 from mangling shell constructs. [ GTEST_VERSION_2="`$GREP -A1 ^.C_INIT $GTEST_FRAMEWORK_SRC/configure.ac | $TAIL -n 1 | $SED -E -e 's/ +\[(.*)],/\1/'`" ] - if test "x$GTEST_VERSION_2" != "x1.8.0"; then - AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.8.1 B]) + if false && test "x$GTEST_VERSION_2" != "x1.14.0"; then + AC_MSG_ERROR([gtest at $GTEST_FRAMEWORK_SRC does not seem to be version 1.14.0 B]) fi fi fi -- 2.30.2