This commit is contained in:
Matt Selsky 2017-10-19 09:55:50 -04:00 committed by ita1024
parent 52a61c45e8
commit c98f8ba2ab
3 changed files with 3 additions and 3 deletions

View File

@ -433,7 +433,7 @@ class Parallel(object):
self.skip(tsk)
self.add_more_tasks(tsk)
elif st == Task.CANCEL_ME:
# A dependency problem has occured, and the
# A dependency problem has occurred, and the
# build is most likely run with `waf -k`
if Logs.verbose > 1:
self.error.append(tsk)

View File

@ -66,7 +66,7 @@ class buildcopy(Task.Task):
"""
Copy for each pair `n` in `node_pairs`: n[0] -> n[1].
Attribute `node_pairs` should contain a list of tuples describing source an target:
Attribute `node_pairs` should contain a list of tuples describing source and target:
node_pairs = [(in, out), ...]

2
waflib/extras/javatest.py Normal file → Executable file
View File

@ -8,7 +8,7 @@ task via the **javatest** feature.
This gives the possibility to run unit test and have them integrated into the
standard waf unit test environment. It has been tested with TestNG and JUnit
but should be easily expandable to other framework given the flexibility of
but should be easily expandable to other frameworks given the flexibility of
ut_str provided by the standard waf unit test environment.
Example usage: