summaryrefslogtreecommitdiffstats
path: root/docs/devel
diff options
context:
space:
mode:
authorPeter Maydell2019-02-11 15:47:44 +0100
committerPeter Maydell2019-02-11 15:47:44 +0100
commita044e3de2917d54b95f1211f4d14ec30cac9a59f (patch)
treef7379c2a6d51dcf485ac2c502dd46b01eadf057e /docs/devel
parentMerge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff)
parenttests/vm: Be verbose while extracting compressed images (diff)
downloadqemu-a044e3de2917d54b95f1211f4d14ec30cac9a59f.tar.gz
qemu-a044e3de2917d54b95f1211f4d14ec30cac9a59f.tar.xz
qemu-a044e3de2917d54b95f1211f4d14ec30cac9a59f.zip
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-110219-1' into staging
Testing updates: - .travis.yml tweaks and optimisations - .cirrus.yml enabled for FreeBSD CI - docker.py clean-ups for binfmt_misc - more control of vm-test builds # gpg: Signature made Mon 11 Feb 2019 13:03:14 GMT # gpg: using RSA key F715F7CD46F94435F4F588658E520D61289519AE # gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full] # Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44 # Subkey fingerprint: F715 F7CD 46F9 4435 F4F5 8865 8E52 0D61 2895 19AE * remotes/stsquad/tags/pull-testing-next-110219-1: tests/vm: Be verbose while extracting compressed images docs/devel/testing: Add -a option to usermod command on docker setup scripts/qemu.py: allow arches use KVM for their 32bit cousins tests/vm: expose BUILD_TARGET, TARGET_LIST and EXTRA_CONFIGURE_OPTS tests/vm: add --build-target option tests/vm: call make check directly for netbsd/freebsd/ubuntu.i386 tests/vm: move images to $HOME/.cache/qemu-vm/images tests: PEP8 cleanup of docker.py, mostly white space tests: docker.py be even smarter with persistent binfmt_misc tests: make docker.py check for persistent configs tests: make docker.py update use configured binfmt path docker: add debian-buster-arm64-cross archive-source.sh: Clone the submodules locally MAINTAINERS: Add an entry for scripts/archive-source.sh .travis.yml: fold --disable-tcg into alternate coroutine builds .travis.yml: separate tools and docs into another entry .travis.yml: stop requesting libffi & gettext from homebrew .cirrus.yml: basic compile and test for FreeBSD Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs/devel')
-rw-r--r--docs/devel/testing.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst
index 18e2c0868a..135743a2bf 100644
--- a/docs/devel/testing.rst
+++ b/docs/devel/testing.rst
@@ -301,7 +301,7 @@ An alternative method to set up permissions is by adding the current user to
.. code::
$ sudo groupadd docker
- $ sudo usermod $USER -G docker
+ $ sudo usermod $USER -a -G docker
$ sudo chown :docker /var/run/docker.sock
Note that any one of above configurations makes it possible for the user to