about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-14 14:35:42 +0000
committerbors <bors@rust-lang.org>2016-12-14 14:35:42 +0000
commit4cda3b6a653bcbdc820d135a9e80c4bcba1dbc04 (patch)
treee1607ed81099d5cb40bdb8f4538add7cb602b530 /src/bootstrap
parent01d53df82ef12625f947f5c0a6004e1aea2f9782 (diff)
parent8ed52ed27d87ed4f17217e3daac49a858a2daa1f (diff)
downloadrust-4cda3b6a653bcbdc820d135a9e80c4bcba1dbc04.tar.gz
rust-4cda3b6a653bcbdc820d135a9e80c4bcba1dbc04.zip
Auto merge of #38351 - sanxiyn:doc-test-args, r=alexcrichton
Document --test-args for rustbuild

There are three changes:

* Replace --filter with --test-args
* Delete `./x.py test src/test/run-pass/assert-*` example, which doesn't work
* As driveby, update Buildbot URLs to https

Fix #38275.

r? @alexcrichton
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/README.md4
-rw-r--r--src/bootstrap/flags.rs1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/bootstrap/README.md b/src/bootstrap/README.md
index d0b501e4d89..b6e66fe3411 100644
--- a/src/bootstrap/README.md
+++ b/src/bootstrap/README.md
@@ -22,7 +22,7 @@ Note that if you're on Unix you should be able to execute the script directly:
 ./x.py build
 ```
 
-The script accepts commands, flags, and filters to determine what to do:
+The script accepts commands, flags, and arguments to determine what to do:
 
 * `build` - a general purpose command for compiling code. Alone `build` will
   bootstrap the entire compiler, and otherwise arguments passed indicate what to
@@ -54,7 +54,7 @@ The script accepts commands, flags, and filters to determine what to do:
   ./x.py test src/test/run-pass
 
   # execute only some tests in the run-pass test suite
-  ./x.py test src/test/run-pass --filter my-filter
+  ./x.py test src/test/run-pass --test-args substring-of-test-name
 
   # execute tests in the standard library in stage0
   ./x.py test --stage 0 src/libstd
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 7a2d56fc5d3..c19d0fdf898 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -108,7 +108,6 @@ Arguments:
     tests that should be compiled and run. For example:
 
         ./x.py test src/test/run-pass
-        ./x.py test src/test/run-pass/assert-*
         ./x.py test src/libstd --test-args hash_map
         ./x.py test src/libstd --stage 0