Skip to content

Commit

Permalink
Merge pull request ninja-build#1467 from cdluminate/master
Browse files Browse the repository at this point in the history
  • Loading branch information
nico authored Oct 24, 2018
2 parents ca041d8 + 33448c8 commit d2045de
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion misc/ninja-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
(save-excursion
(goto-char (line-end-position 0))
(or
;; If we're continuting the previous line, it's not a
;; If we're continuing the previous line, it's not a
;; comment.
(not (eq ?$ (char-before)))
;; Except if the previous line is a comment as well, as the
Expand Down
4 changes: 2 additions & 2 deletions misc/ninja_syntax_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ def test_few_long_words(self):
self.out.getvalue())

def test_comment_wrap(self):
# Filenames shoud not be wrapped
# Filenames should not be wrapped
self.n.comment('Hello /usr/local/build-tools/bin')
self.assertEqual('# Hello\n# /usr/local/build-tools/bin\n',
self.out.getvalue())

def test_short_words_indented(self):
# Test that indent is taking into acount when breaking subsequent lines.
# Test that indent is taking into account when breaking subsequent lines.
# The second line should not be ' to tree', as that's longer than the
# test layout width of 8.
self.n._line('line_one to tree')
Expand Down
4 changes: 2 additions & 2 deletions src/deps_log_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ TEST_F(DepsLogTest, DoubleEntry) {
ASSERT_GT(file_size, 0);
}

// Now reload the file, and readd the same deps.
// Now reload the file, and read the same deps.
{
State state;
DepsLog log;
Expand Down Expand Up @@ -203,7 +203,7 @@ TEST_F(DepsLogTest, Recompact) {
ASSERT_GT(file_size, 0);
}

// Now reload the file, and add slighly different deps.
// Now reload the file, and add slightly different deps.
int file_size_2;
{
State state;
Expand Down
2 changes: 1 addition & 1 deletion src/ninja.cc
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ struct NinjaMain : public BuildLogUser {
// Just checking n isn't enough: If an old output is both in the build log
// and in the deps log, it will have a Node object in state_. (It will also
// have an in edge if one of its inputs is another output that's in the deps
// log, but having a deps edge product an output thats input to another deps
// log, but having a deps edge product an output that's input to another deps
// edge is rare, and the first recompaction will delete all old outputs from
// the deps log, and then a second recompaction will clear the build log,
// which seems good enough for this corner case.)
Expand Down
2 changes: 1 addition & 1 deletion src/state.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct Rule;
/// Pools are scoped to a State. Edges within a State will share Pools. A Pool
/// will keep a count of the total 'weight' of the currently scheduled edges. If
/// a Plan attempts to schedule an Edge which would cause the total weight to
/// exceed the depth of the Pool, the Pool will enque the Edge instead of
/// exceed the depth of the Pool, the Pool will enqueue the Edge instead of
/// allowing the Plan to schedule it. The Pool will relinquish queued Edges when
/// the total scheduled weight diminishes enough (i.e. when a scheduled edge
/// completes).
Expand Down
2 changes: 1 addition & 1 deletion src/test.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ extern testing::Test* g_current_test;
} \
}

// Support utilites for tests.
// Support utilities for tests.

struct Node;

Expand Down

0 comments on commit d2045de

Please sign in to comment.