From 44a72abac6ed9b73d149d45ac813ec5de2134f61 Mon Sep 17 00:00:00 2001 From: Aidan Wolter <awolter@google.com> Date: Wed, 9 Jan 2019 17:40:30 +0000 Subject: [PATCH] Revert "Update docs with new `fx run` format" This reverts commit 2cfa603e4ae35d3571fde6fe9bba6995cce90853. Reason for revert: <INSERT REASONING HERE> Original change's description: > Update docs with new `fx run` format > > Bug: None > Test: None > Change-Id: Ifb7c85b400a48fc9913c54f57a1a17f5ed87e56a TBR=mcgrathr@google.com,porce@google.com,awolter@google.com,brettw@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: None Change-Id: Ie07c7363006e5980685a2aa07b1231861f745094 --- development/workflows/testing_faq.md | 2 +- getting_started.md | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/development/workflows/testing_faq.md b/development/workflows/testing_faq.md index 2f75db2b475..9bdd4ca9c32 100644 --- a/development/workflows/testing_faq.md +++ b/development/workflows/testing_faq.md @@ -71,7 +71,7 @@ while piping the output back to your workstation terminal. Slick! Make sure your device is running (hit Ctrl-D to boot an existing image) and connected to your workstation. If your target device is a QEMU emulator, then it needs networking to receive -the test package. Start your emulator with `fx run -- -N`. +the test package. Start your emulator with `fx run -N`. From your workstation, `fx run-test scenic_unittests`. The argument to `run-test` is the name of the test program as defined in `BUILD.gn`, for diff --git a/getting_started.md b/getting_started.md index 63bd02d316a..77271a4b66a 100644 --- a/getting_started.md +++ b/getting_started.md @@ -121,21 +121,12 @@ disk image: fx run ``` -The `fx run` command will prepare a QEMU disk image, then call `run-zircon` to -boot Zircon. To specify the disk size, use the `-S` option: -* `-S` sets QEMU's disk size. Units can be specified by suffix as "k", "K", "M", - "G", and "T". - -Use `fx run -h` to see all available options for `fx run`, and `fx run -- -h` to -see all available options for `run-zircon`. - -There are various flags to control QEMU's configuration. As these flags must be -forwarded to `run-zircon`, they must follow after a `--`. +There are various flags for `fx run` to control QEMU's configuration: * `-m` sets QEMU's memory size in MB. * `-g` enables graphics (see below). * `-N` enables networking (see below). -Example: `fx run -S 2G -- -g` +Use `fx run -h` to see all available options. #### QEMU tips @@ -150,7 +141,7 @@ support. Only the Zircon UI renders. To enable graphics under QEMU, add the `-g` flag to `fx run`: ``` -fx run -- -g +fx run -g ``` #### Enabling Network @@ -161,7 +152,7 @@ a virtual interface for QEMU's use. Once this is done you can add the `-N` and `-u` flags to `fx run`: ``` -fx run -- -N -u $FUCHSIA_SCRIPTS_DIR/start-dhcp-server.sh +fx run -N -u $FUCHSIA_SCRIPTS_DIR/start-dhcp-server.sh ``` The `-u` flag runs a script that sets up a local DHCP server and NAT to -- GitLab