Merge 7c45bff into 7a7200e

cpputest · Dec 8, 2022 · eae674e · eae674e
2 parents 7a7200e + 7c45bff
commit eae674e
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml
@@ -77,6 +77,15 @@ jobs:
           - name: GTest 1.8
             os: ubuntu-20.04
             target: check_gtest18
+          - name: GTest 1.10
+            os: ubuntu-20.04
+            target: check_gtest110
+          - 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
@@ -260,6 +260,25 @@ if INCLUDE_CPPUTEST_EXT
 	./$(CPPUTESTEXT_TESTS)
 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; \
+	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; \
+	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 +330,34 @@ 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
+
+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
+
+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
 	rm -rf cpputest_build_gtest17
 	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_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"