From 3014b91ddeee7f1575d26f2e7dad2b8cbda9a905 Mon Sep 17 00:00:00 2001 From: Chad Condon Date: Thu, 3 Nov 2022 18:22:22 -0700 Subject: [PATCH 1/3] Test gtest 1.10 --- .github/workflows/basic.yml | 3 +++ Makefile.am | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 7d5786941..b99197ba2 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -77,6 +77,9 @@ jobs: - name: GTest 1.8 os: ubuntu-20.04 target: check_gtest18 + - name: GTest 1.10 + os: ubuntu-20.04 + target: check_gtest110 - name: Disable long long os: ubuntu-latest configure_args: --disable-longlong diff --git a/Makefile.am b/Makefile.am index a770a68b8..6976e8453 100644 --- a/Makefile.am +++ b/Makefile.am @@ -260,6 +260,12 @@ if INCLUDE_CPPUTEST_EXT ./$(CPPUTESTEXT_TESTS) endif +cpputest_build_gtest110: + mkdir -p cpputest_build_gtest110 + cd cpputest_build_gtest110; \ + wget https://github.com/google/googletest/archive/refs/tags/release-1.10.0.zip -O gtest-1.10.0.zip && unzip gtest-1.10.0.zip; \ + cd googletest-release-1.10.0; cmake .; make + cpputest_build_gtest18: mkdir -p cpputest_build_gtest18 cd cpputest_build_gtest18; \ @@ -311,13 +317,20 @@ check_gtest18: cpputest_build_gtest18 export GTEST_HOME=`pwd`/cpputest_build_gtest18/googletest-release-1.8.0/googletest; \ make distclean; $(srcdir)/configure --enable-std-cpp98; make check +check_gtest110: cpputest_build_gtest110 + @echo "Build using gmock 1.10" + export GMOCK_MOCK=`pwd`/cpputest_build_gtest110/googletest-release-1.10.0; \ + export GTEST_HOME=`pwd`/cpputest_build_gtest110/googletest-release-1.10.0; \ + make distclean; $(srcdir)/configure --enable-std-cpp11; make check + remove_gtest_directories: rm -rf cpputest_build_gtest15 rm -rf cpputest_build_gtest16 rm -rf cpputest_build_gtest17 rm -rf cpputest_build_gtest18 + rm -rf cpputest_build_gtest110 -check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 +check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 check_gtest110 check_basic: @echo "If dash is available, run the configure with dash to find bash-isms and increase portability" From a91d6c56a89a5c28a26a072d89f1c45e65c79ff8 Mon Sep 17 00:00:00 2001 From: Chad Condon Date: Thu, 3 Nov 2022 19:01:18 -0700 Subject: [PATCH 2/3] test with gtest 1.11 --- .github/workflows/basic.yml | 3 +++ Makefile.am | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index b99197ba2..78199c634 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -80,6 +80,9 @@ jobs: - name: GTest 1.10 os: ubuntu-20.04 target: check_gtest110 + - name: GTest 1.11 + os: ubuntu-20.04 + target: check_gtest111 - name: Disable long long os: ubuntu-latest configure_args: --disable-longlong diff --git a/Makefile.am b/Makefile.am index 6976e8453..27df95d95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -260,6 +260,13 @@ if INCLUDE_CPPUTEST_EXT ./$(CPPUTESTEXT_TESTS) endif + +cpputest_build_gtest111: + mkdir -p cpputest_build_gtest111 + cd cpputest_build_gtest111; \ + wget https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip -O gtest-1.11.0.zip && unzip gtest-1.11.0.zip; \ + cd googletest-release-1.11.0; cmake .; make + cpputest_build_gtest110: mkdir -p cpputest_build_gtest110 cd cpputest_build_gtest110; \ @@ -323,14 +330,21 @@ check_gtest110: cpputest_build_gtest110 export GTEST_HOME=`pwd`/cpputest_build_gtest110/googletest-release-1.10.0; \ make distclean; $(srcdir)/configure --enable-std-cpp11; make check +check_gtest111: cpputest_build_gtest111 + @echo "Build using gmock 1.11" + export GMOCK_MOCK=`pwd`/cpputest_build_gtest111/googletest-release-1.11.0; \ + export GTEST_HOME=`pwd`/cpputest_build_gtest111/googletest-release-1.11.0; \ + make distclean; $(srcdir)/configure --enable-std-cpp11; make check + remove_gtest_directories: rm -rf cpputest_build_gtest15 rm -rf cpputest_build_gtest16 rm -rf cpputest_build_gtest17 rm -rf cpputest_build_gtest18 rm -rf cpputest_build_gtest110 + rm -rf cpputest_build_gtest111 -check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 check_gtest110 +check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 check_gtest110 check_gtest111 check_basic: @echo "If dash is available, run the configure with dash to find bash-isms and increase portability" From 7c45bff0cdf93b5a175107d2e16341b4c0c7359b Mon Sep 17 00:00:00 2001 From: Chad Condon Date: Thu, 3 Nov 2022 19:06:17 -0700 Subject: [PATCH 3/3] test with gtest 1.12 --- .github/workflows/basic.yml | 3 +++ Makefile.am | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 78199c634..99fdbb10a 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -83,6 +83,9 @@ jobs: - name: GTest 1.11 os: ubuntu-20.04 target: check_gtest111 + - name: GTest 1.12 + os: ubuntu-20.04 + target: check_gtest112 - name: Disable long long os: ubuntu-latest configure_args: --disable-longlong diff --git a/Makefile.am b/Makefile.am index 27df95d95..fd1870225 100644 --- a/Makefile.am +++ b/Makefile.am @@ -261,6 +261,12 @@ if INCLUDE_CPPUTEST_EXT endif +cpputest_build_gtest112: + mkdir -p cpputest_build_gtest112 + cd cpputest_build_gtest112; \ + wget https://github.com/google/googletest/archive/refs/tags/release-1.12.1.zip -O gtest-1.12.1.zip && unzip gtest-1.12.1.zip; \ + cd googletest-release-1.12.1; cmake .; make + cpputest_build_gtest111: mkdir -p cpputest_build_gtest111 cd cpputest_build_gtest111; \ @@ -336,6 +342,12 @@ check_gtest111: cpputest_build_gtest111 export GTEST_HOME=`pwd`/cpputest_build_gtest111/googletest-release-1.11.0; \ make distclean; $(srcdir)/configure --enable-std-cpp11; make check +check_gtest112: cpputest_build_gtest112 + @echo "Build using gmock 1.12" + export GMOCK_MOCK=`pwd`/cpputest_build_gtest121/googletest-release-1.12.1; \ + export GTEST_HOME=`pwd`/cpputest_build_gtest121/googletest-release-1.12.1; \ + make distclean; $(srcdir)/configure --enable-std-cpp11; make check + remove_gtest_directories: rm -rf cpputest_build_gtest15 rm -rf cpputest_build_gtest16 @@ -343,8 +355,9 @@ remove_gtest_directories: rm -rf cpputest_build_gtest18 rm -rf cpputest_build_gtest110 rm -rf cpputest_build_gtest111 + rm -rf cpputest_build_gtest112 -check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 check_gtest110 check_gtest111 +check_gtest: remove_gtest_directories check_gtest15 check_gtest16 check_gtest17 check_gtest18 check_gtest110 check_gtest111 check_gtest112 check_basic: @echo "If dash is available, run the configure with dash to find bash-isms and increase portability"