This reverts commit ce2eefd7c21697fee87a0686353de881081d22c6. The
underlying cause was fixed with eb4f8e100f.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/configure b/configure
index 4ea3f14883..f59d484f7a 100755
--- a/configure
+++ b/configure
@@ -7487,7 +7487,6 @@ alpha)
 esac
 
 if test "$gprof" = "yes" ; then
-  echo "CONFIG_GPROF=y" >> $config_host_mak
   echo "TARGET_GPROF=y" >> $config_target_mak
   if test "$target_linux_user" = "yes" ; then
     cflags="-p $cflags"
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 601ef4f64c..f403a6571d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -88,8 +88,7 @@ check-unit-y += tests/test-rcu-simpleq$(EXESUF)
 check-unit-y += tests/test-rcu-tailq$(EXESUF)
 check-unit-y += tests/test-qdist$(EXESUF)
 check-unit-y += tests/test-qht$(EXESUF)
-# FIXME: {test-qht-par + gprof} often break on Travis CI
-check-unit-$(call lnot,$(CONFIG_GPROF)) += tests/test-qht-par$(EXESUF)
+check-unit-y += tests/test-qht-par$(EXESUF)
 check-unit-y += tests/test-bitops$(EXESUF)
 check-unit-y += tests/test-bitcnt$(EXESUF)
 check-unit-y += tests/test-qdev-global-props$(EXESUF)
-- 
2.17.1

Alex Bennée <alex.bennee@linaro.org> writes:

> This reverts commit ce2eefd7c21697fee87a0686353de881081d22c6. The
> underlying cause was fixed with eb4f8e100f.

A quick flurry of comments came just after I posted the PR. Should I
re-spin v2 without the last minute clean-up? I just worry this sticking
plaster is:

 a) a bit hacky, introducing a new build glag
 b) might end up masking stuff we want to catch

>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> diff --git a/configure b/configure
> index 4ea3f14883..f59d484f7a 100755
> --- a/configure
> +++ b/configure
> @@ -7487,7 +7487,6 @@ alpha)
>  esac
>
>  if test "$gprof" = "yes" ; then
> -  echo "CONFIG_GPROF=y" >> $config_host_mak
>    echo "TARGET_GPROF=y" >> $config_target_mak
>    if test "$target_linux_user" = "yes" ; then
>      cflags="-p $cflags"
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 601ef4f64c..f403a6571d 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -88,8 +88,7 @@ check-unit-y += tests/test-rcu-simpleq$(EXESUF)
>  check-unit-y += tests/test-rcu-tailq$(EXESUF)
>  check-unit-y += tests/test-qdist$(EXESUF)
>  check-unit-y += tests/test-qht$(EXESUF)
> -# FIXME: {test-qht-par + gprof} often break on Travis CI
> -check-unit-$(call lnot,$(CONFIG_GPROF)) += tests/test-qht-par$(EXESUF)
> +check-unit-y += tests/test-qht-par$(EXESUF)
>  check-unit-y += tests/test-bitops$(EXESUF)
>  check-unit-y += tests/test-bitcnt$(EXESUF)
>  check-unit-y += tests/test-qdev-global-props$(EXESUF)


--
Alex Bennée