summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPeter Maydell2019-01-14 20:28:12 +0100
committerPeter Maydell2019-01-14 20:28:12 +0100
commiteb0667fe7f1b6d40dfb7172f17ab4db975acbbd6 (patch)
treeb2852d4d3304a2a06bfe1fd01382e8a0c18af9c0 /configure
parentMerge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff)
parentRevert "tests: Disable qht-bench parallel test when using gprof" (diff)
downloadqemu-eb0667fe7f1b6d40dfb7172f17ab4db975acbbd6.tar.gz
qemu-eb0667fe7f1b6d40dfb7172f17ab4db975acbbd6.tar.xz
qemu-eb0667fe7f1b6d40dfb7172f17ab4db975acbbd6.zip
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-140119-1' into staging
A bunch of fixes for testing: - Various Travis updates - "stable" SID snapshot for docker - avoid :latest docker tags - g_usleep fix for some tests # gpg: Signature made Mon 14 Jan 2019 14:59:35 GMT # gpg: using RSA key FBD0DB095A9E2A44 # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 * remotes/stsquad/tags/pull-testing-next-140119-1: (21 commits) Revert "tests: Disable qht-bench parallel test when using gprof" tests: use g_usleep instead of rem = sleep(time) tests/docker: remove SID_AGE test hack tests/docker: update our Travis image travis: bump to Xenial baseline docker: Use a stable snapshot for Debian Sid travis: remove matrix settings that duplicate global settings travis: run tests in verbose mode travis: stop using container based envs travis: stop redefining the script commands travis: use homebrew addon for MacOSX travis: don't clone git submodules upfront travis: standardize the syntax used for env variables travis: define all the build matrix entries in one place travis: add whitespace between each major section & matrix entry tests: use in-place sed magic for enabling deb-src in travis image tests: update Fedora i386 cross image to Fedora 29 tests: update Fedora dockerfile to use Fedora 29 tests: remove obsolete 'debian' dockerfile tests: run ldconfig after installing extra software ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 0 insertions, 1 deletions
diff --git a/configure b/configure
index f992709b89..3eee3fcf70 100755
--- a/configure
+++ b/configure
@@ -7470,7 +7470,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"