Message ID | 1431713119-2821-1-git-send-email-casantos@datacom.ind.br |
---|---|
State | Superseded, archived |
Headers | show |
Carlos, all, On Fri, May 15, 2015 at 8:05 PM, Carlos Santos <casantos@datacom.ind.br> wrote: > Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s > specifics in mind, Google C++ Mocking Framework (or Google Mock for > short) is a library for writing and using C++ mock classes. > > Google Mock: > > * lets you create mock classes trivially using simple macros, > * supports a rich set of matchers and actions, > * handles unordered, partially ordered, or completely ordered > expectations, > * is extensible by users, and > * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and > Symbian. > > http://code.google.com/p/googlemock/ > > There are both host and target packages. The target one has include > files required to compile the tests and the static libraries required > to link/run them. The host package installs gmock_gen, a Python script > used to generate code mocks. > > Signed-off-by: Marcelo Barbosa <marcelo.barbosa@datacom.ind.br> > Signed-off-by: Carlos Santos <casantos@datacom.ind.br> > --- > package/Config.in | 1 + > package/gmock/Config.in | 31 +++++++++++++++++++++++++++++ > package/gmock/gmock.hash | 2 ++ > package/gmock/gmock.mk | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 86 insertions(+) > create mode 100644 package/gmock/Config.in > create mode 100644 package/gmock/gmock.hash > create mode 100644 package/gmock/gmock.mk > > diff --git a/package/Config.in b/package/Config.in > index af4d2b7..3190bf8 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1014,6 +1014,7 @@ menu "Other" > source "package/flann/Config.in" > source "package/glibmm/Config.in" > source "package/glm/Config.in" > + source "package/gmock/Config.in" > source "package/gmp/Config.in" > source "package/gsl/Config.in" > source "package/gtest/Config.in" > diff --git a/package/gmock/Config.in b/package/gmock/Config.in > new file mode 100644 > index 0000000..8a18c29 > --- /dev/null > +++ b/package/gmock/Config.in > @@ -0,0 +1,31 @@ > +config BR2_PACKAGE_GMOCK > + bool "gmock" > + depends on BR2_USE_WCHAR > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_USE_MMU # fork() > + help > + Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s > + specifics in mind, Google C++ Mocking Framework (or Google Mock for > + short) is a library for writing and using C++ mock classes. > + > + Google Mock: > + > + * lets you create mock classes trivially using simple macros, > + * supports a rich set of matchers and actions, > + * handles unordered, partially ordered, or completely ordered > + expectations, > + * is extensible by users, and > + * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and > + Symbian. > + > + http://code.google.com/p/googlemock/ > + > + There are both host and target packages. The target one has include > + files required to compile the tests and the static libraries required > + to link/run them. The host package installs gmock_gen, a Python script > + used to generate code mocks. > + > +comment "gmock needs a toolchain w/ C++, wchar, threads" > + depends on BR2_USE_MMU > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP > diff --git a/package/gmock/gmock.hash b/package/gmock/gmock.hash > new file mode 100644 > index 0000000..2b71739 > --- /dev/null > +++ b/package/gmock/gmock.hash > @@ -0,0 +1,2 @@ > +# Locally computed > +sha256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b gmock-1.7.0.zip > diff --git a/package/gmock/gmock.mk b/package/gmock/gmock.mk > new file mode 100644 > index 0000000..3a7173e > --- /dev/null > +++ b/package/gmock/gmock.mk > @@ -0,0 +1,52 @@ > +################################################################################ > +# > +# gmock > +# > +################################################################################ > + > +GMOCK_VERSION = 1.7.0 According to [1], gmock version must be the same as the gtest's one, so maybe we should do: GMOCK_VERSION = $(GTEST_VERSION) (but, taking care of the *.mk inclusion to get GTEST_VERSION defined before including gmock.mk). > +GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip > +GMOCK_SITE = http://googlemock.googlecode.com/files > +GMOCK_INSTALL_STAGING = YES > +GMOCK_INSTALL_TARGET = NO > +GMOCK_LICENSE = BSD-3c > +GMOCK_LICENSE_FILES = LICENSE > +GMOCK_DEPENDENCIES = gtest > +HOST_GMOCK_DEPENDENCIES = host-python Does this require python2? or can it work with python3? > + > +GMOCK_CONF_OPTS = --enable-static --disable-shared Why do you always force the static lib to be built? is it for the same reason as gtest [2]? > + > +define GMOCK_EXTRACT_CMDS > + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(BUILD_DIR) > +endef > + > +# We can't use the default rule for autotools-package staging because it fails > +# because it tries to rebuild/install gtest stuff and fails after this error: > +# "'make install' is dangerous and not supported. Instead, see README for > +# how to integrate Google Test into your build system." > +define GMOCK_INSTALL_STAGING_CMDS > + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock.a $(STAGING_DIR)/usr/lib/libgmock.a > + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock_main.a $(STAGING_DIR)/usr/lib/libgmock_main.a > + $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gmock/ > + cp -rp $(@D)/include/gmock/* $(STAGING_DIR)/usr/include/gmock/ > +endef > + > +# Unzipping inside $(@D) and moving everything from the created subdirectory is > +# required because unzipping directly in $(BUILD_DIR) would cause host-gmock to > +# overwrite the gmock subdir instead of unzipping in a host-gmock subdir. > +define HOST_GMOCK_EXTRACT_CMDS > + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(@D) > + mv $(@D)/gmock-$(GMOCK_VERSION)/* $(@D) > + rmdir $(@D)/gmock-$(GMOCK_VERSION) > +endef > + > +define HOST_GMOCK_INSTALL_CMDS > + $(INSTALL) -D -m 0755 $(@D)/scripts/generator/gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen.py > + ln -sf gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen > + cp -rp $(@D)/scripts/generator/cpp $(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages > +endef > + > +$(eval $(autotools-package)) > +# The host package does not build anything, just installs gmock_gen stuff, so > +# it does not need to be a host-autotools-package. > +$(eval $(host-generic-package)) AFAI understand, host-gmock only install tools needed when building a package depending on gmock (target package). Since host-gmock is not a dependency of gmock, a package using gmock will have to depend on both gmock and host-gmock at buildtime. Maybe, it would be good to make gmock depends on host-gmock to ensure that all needed tools will be available when building a package depending on gmock, but without the explicitly dependency on host-gmock. Thoughts? Please, take into account these comments and submit a new version of this patch if you are still interested in having it in the official Buildroot tree, meanwhile it'll be marked as "Change Requested" in patchwork. [1] https://code.google.com/p/googlemock/source/browse/trunk/README#43 [2] http://git.buildroot.net/buildroot/tree/package/gtest/gtest.mk#n15 Regards,
Samuel, Carlos, On Tue, 14 Jul 2015 12:09:34 +0200, Samuel Martin wrote: > > +################################################################################ > > +# > > +# gmock > > +# > > +################################################################################ > > + > > +GMOCK_VERSION = 1.7.0 > According to [1], gmock version must be the same as the gtest's one, > so maybe we should do: > GMOCK_VERSION = $(GTEST_VERSION) > (but, taking care of the *.mk inclusion to get GTEST_VERSION defined > before including gmock.mk). I don't think this is a good idea. gmock is included *before* gtest, and there's not much that can be done about this. So instead, I would recommend to just to: # Make sure this remains the same version as the gtest one GMOCK_VERSION = 1.7.0 and then in gtest.mk: # Make sure this remains the same version as the gmock one GTEST_VERSION = 1.7.0 Thomas
> From: "Samuel Martin" <s.martin49@gmail.com> > To: "Carlos Santos" <casantos@datacom.ind.br> > Cc: "buildroot" <buildroot@buildroot.org> > Sent: Tuesday, July 14, 2015 7:09:34 AM > Subject: Re: [Buildroot] [PATCH v2 1/1] gmock: new package >> diff --git a/package/gmock/gmock.mk b/package/gmock/gmock.mk >> new file mode 100644 >> index 0000000..3a7173e >> --- /dev/null >> +++ b/package/gmock/gmock.mk >> @@ -0,0 +1,52 @@ >> +################################################################################ >> +# >> +# gmock >> +# >> +################################################################################ >> + >> +GMOCK_VERSION = 1.7.0 > According to [1], gmock version must be the same as the gtest's one, > so maybe we should do: > GMOCK_VERSION = $(GTEST_VERSION) > (but, taking care of the *.mk inclusion to get GTEST_VERSION defined > before including gmock.mk). > >> +GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip >> +GMOCK_SITE = http://googlemock.googlecode.com/files >> +GMOCK_INSTALL_STAGING = YES >> +GMOCK_INSTALL_TARGET = NO >> +GMOCK_LICENSE = BSD-3c >> +GMOCK_LICENSE_FILES = LICENSE >> +GMOCK_DEPENDENCIES = gtest >> +HOST_GMOCK_DEPENDENCIES = host-python > Does this require python2? or can it work with ? I did not test with python3. I will give it a try and update gmock.mk accordingly. >> +GMOCK_CONF_OPTS = --enable-static --disable-shared > Why do you always force the static lib to be built? is it for the same > reason as gtest [2]? It's required in order to keep the GMock package completely separated from GTest. According to [3] "Google Mock can be used as a DLL, but the same DLL must contain Google Test as well. See Google Test's README file for instructions on how to set up necessary compiler settings". [...] >> +# The host package does not build anything, just installs gmock_gen stuff, so >> +# it does not need to be a host-autotools-package. >> +$(eval $(host-generic-package)) > > AFAI understand, host-gmock only install tools needed when building a > package depending on gmock (target package). > Since host-gmock is not a dependency of gmock, a package using gmock > will have to depend on both gmock and host-gmock at buildtime. > Maybe, it would be good to make gmock depends on host-gmock to ensure > that all needed tools will be available when building a package > depending on gmock, but without the explicitly dependency on > host-gmock. Yes, I will add a dependence on host-gmock. > Please, take into account these comments and submit a new version of > this patch if you are still interested in having it in the official > Buildroot tree, meanwhile it'll be marked as "Change Requested" in > patchwork. > > > [1] https://code.google.com/p/googlemock/source/browse/trunk/README#43 > [2] http://git.buildroot.net/buildroot/tree/package/gtest/gtest.mk#n15 [3] https://code.google.com/p/googlemock/source/browse/trunk/README#276 Carlos Santos (Casantos) DATACOM, P&D
> From: "Carlos Santos" <casantos@datacom.ind.br> > To: "Samuel Martin" <s.martin49@gmail.com> > Cc: "buildroot" <buildroot@buildroot.org> > Sent: Thursday, July 16, 2015 8:34:51 AM > Subject: Re: [Buildroot] [PATCH v2 1/1] gmock: new package [...] >> From: "Samuel Martin" <s.martin49@gmail.com> >> To: "Carlos Santos" <casantos@datacom.ind.br> >> Cc: "buildroot" <buildroot@buildroot.org> >> Sent: Tuesday, July 14, 2015 7:09:34 AM >> Subject: Re: [Buildroot] [PATCH v2 1/1] gmock: new package [...] >>> +GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip >>> +GMOCK_SITE = http://googlemock.googlecode.com/files >>> +GMOCK_INSTALL_STAGING = YES >>> +GMOCK_INSTALL_TARGET = NO >>> +GMOCK_LICENSE = BSD-3c >>> +GMOCK_LICENSE_FILES = LICENSE >>> +GMOCK_DEPENDENCIES = gtest >>> +HOST_GMOCK_DEPENDENCIES = host-python >> Does this require python2? or can it work with python3? > > I did not test with python3. I will give it a try and update gmock.mk > accordingly. Is there a way to select between host-python and host-python3? I can select either python or python3 via menuconfig in Target packages -> Interpreter languages and scripting but this would add python to the target system. Carlos Santos (Casantos) DATACOM, P&D
Carlos, On Thu, Jul 16, 2015 at 10:51 PM, Carlos Santos <casantos@datacom.ind.br> wrote: [...] > > Is there a way to select between host-python and host-python3? I can select either python or python3 via menuconfig in > > Target packages -> Interpreter languages and scripting > > but this would add python to the target system. When you select python3 for the target, the host-python3 is built and set as default python interpreter in $(HOST_DIR) ; iow, $(HOST_DIR)/usr/bin/python points to python3. So the way of buiilding host-python3 is selecting python3 for the target. Regards,
diff --git a/package/Config.in b/package/Config.in index af4d2b7..3190bf8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1014,6 +1014,7 @@ menu "Other" source "package/flann/Config.in" source "package/glibmm/Config.in" source "package/glm/Config.in" + source "package/gmock/Config.in" source "package/gmp/Config.in" source "package/gsl/Config.in" source "package/gtest/Config.in" diff --git a/package/gmock/Config.in b/package/gmock/Config.in new file mode 100644 index 0000000..8a18c29 --- /dev/null +++ b/package/gmock/Config.in @@ -0,0 +1,31 @@ +config BR2_PACKAGE_GMOCK + bool "gmock" + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + help + Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s + specifics in mind, Google C++ Mocking Framework (or Google Mock for + short) is a library for writing and using C++ mock classes. + + Google Mock: + + * lets you create mock classes trivially using simple macros, + * supports a rich set of matchers and actions, + * handles unordered, partially ordered, or completely ordered + expectations, + * is extensible by users, and + * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and + Symbian. + + http://code.google.com/p/googlemock/ + + There are both host and target packages. The target one has include + files required to compile the tests and the static libraries required + to link/run them. The host package installs gmock_gen, a Python script + used to generate code mocks. + +comment "gmock needs a toolchain w/ C++, wchar, threads" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package/gmock/gmock.hash b/package/gmock/gmock.hash new file mode 100644 index 0000000..2b71739 --- /dev/null +++ b/package/gmock/gmock.hash @@ -0,0 +1,2 @@ +# Locally computed +sha256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b gmock-1.7.0.zip diff --git a/package/gmock/gmock.mk b/package/gmock/gmock.mk new file mode 100644 index 0000000..3a7173e --- /dev/null +++ b/package/gmock/gmock.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# gmock +# +################################################################################ + +GMOCK_VERSION = 1.7.0 +GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip +GMOCK_SITE = http://googlemock.googlecode.com/files +GMOCK_INSTALL_STAGING = YES +GMOCK_INSTALL_TARGET = NO +GMOCK_LICENSE = BSD-3c +GMOCK_LICENSE_FILES = LICENSE +GMOCK_DEPENDENCIES = gtest +HOST_GMOCK_DEPENDENCIES = host-python + +GMOCK_CONF_OPTS = --enable-static --disable-shared + +define GMOCK_EXTRACT_CMDS + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(BUILD_DIR) +endef + +# We can't use the default rule for autotools-package staging because it fails +# because it tries to rebuild/install gtest stuff and fails after this error: +# "'make install' is dangerous and not supported. Instead, see README for +# how to integrate Google Test into your build system." +define GMOCK_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock.a $(STAGING_DIR)/usr/lib/libgmock.a + $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock_main.a $(STAGING_DIR)/usr/lib/libgmock_main.a + $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gmock/ + cp -rp $(@D)/include/gmock/* $(STAGING_DIR)/usr/include/gmock/ +endef + +# Unzipping inside $(@D) and moving everything from the created subdirectory is +# required because unzipping directly in $(BUILD_DIR) would cause host-gmock to +# overwrite the gmock subdir instead of unzipping in a host-gmock subdir. +define HOST_GMOCK_EXTRACT_CMDS + $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(@D) + mv $(@D)/gmock-$(GMOCK_VERSION)/* $(@D) + rmdir $(@D)/gmock-$(GMOCK_VERSION) +endef + +define HOST_GMOCK_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/scripts/generator/gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen.py + ln -sf gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen + cp -rp $(@D)/scripts/generator/cpp $(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages +endef + +$(eval $(autotools-package)) +# The host package does not build anything, just installs gmock_gen stuff, so +# it does not need to be a host-autotools-package. +$(eval $(host-generic-package))