Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 21 Nov 2012 19:52:03 -0500
changeset 113958 5a755dd85a35f65062375ec2e05f140e82e2e41d
parent 113955 5593cd83590e87069b4650421c7b3e309529f703 (current diff)
parent 113957 20ec9014f220c96a0434a4043f5a5cabb0cd5e37 (diff)
child 113959 37c36aa6f5639da9428f93de06e62bf4ff02114f
push id18470
push userryanvm@gmail.com
push dateThu, 22 Nov 2012 00:52:13 +0000
treeherdermozilla-inbound@37c36aa6f563 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound.
--- a/python/mach/mach/main.py
+++ b/python/mach/mach/main.py
@@ -122,22 +122,21 @@ class Mach(object):
 mach (German for "do") is the main interface to the Mozilla build system and
 common developer tasks.
 
 You tell mach the command you want to perform and it does it for you.
 
 Some common commands are:
 
     %(prog)s build     Build/compile the source tree.
-    %(prog)s test      Run tests.
     %(prog)s help      Show full help, including the list of all commands.
 
 To see more help for a specific command, run:
 
-  %(prog)s <command> --help
+  %(prog)s help <command>
 """
 
     def __init__(self, cwd):
         assert os.path.isdir(cwd)
 
         self.cwd = cwd
         self.log_manager = LoggingManager()
         self.logger = logging.getLogger(__name__)