aboutsummaryrefslogtreecommitdiff
path: root/tests/runner.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-10-08 11:47:14 -0400
committerAlon Zakai <alonzakai@gmail.com>2013-10-08 11:47:14 -0400
commit0a229cf5a240a1ebf4ff5d0ebb501a286bc96202 (patch)
tree2797d054788e88863d77f9826dde94fb4c276c69 /tests/runner.py
parent05b6aa32a5f1633797f7eae390b3a8048b29ca69 (diff)
parentae5ef852920ce67449af7693f05a767a87aed976 (diff)
Merge branch 'incoming'
Diffstat (limited to 'tests/runner.py')
-rwxr-xr-xtests/runner.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/runner.py b/tests/runner.py
index ddc97ea4..867f7113 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -737,13 +737,15 @@ if __name__ == '__main__':
print '''
==============================================================================
Running the main part of the test suite. Don't forget to run the other parts!
+A recommended order is:
- other - tests separate from the main suite
sanity - tests for first run, etc., modifies ~/.emscripten
- benchmark - run before and after each set of changes before pushing to
- master, verify no regressions
+ (the main test suite)
+ other - tests separate from the main suite
browser - runs pages in a web browser
sockets - runs websocket networking tests
+ benchmark - run before and after each set of changes before pushing to
+ master, verify no regressions
There are also commands to run specific subsets of the test suite:
@@ -799,3 +801,4 @@ an individual test with
# Return the number of failures as the process exit code for automating success/failure reporting.
exit(numFailures)
+