diff options
| author | Evan Martin <martine@danga.com> | 2012-06-02 23:56:25 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-06-02 23:56:25 (GMT) |
| commit | 19209305c228ce8543f1771cea60c49cef354ed3 (patch) | |
| tree | 191b675c28a165168a2267c58b9372ff9360c92e /src | |
| parent | 28196d9abc5d75cfad681d5ac99c566d9c2d1e0d (diff) | |
| parent | 555431a676f077dd43cf809312c3781e181aed41 (diff) | |
| download | Ninja-19209305c228ce8543f1771cea60c49cef354ed3.zip Ninja-19209305c228ce8543f1771cea60c49cef354ed3.tar.gz Ninja-19209305c228ce8543f1771cea60c49cef354ed3.tar.bz2 | |
Merge pull request #321 from nico/diff
Fix a bug that caused total_time to always be -1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/build.cc b/src/build.cc index 9e3dd6f..65aa6a9 100644 --- a/src/build.cc +++ b/src/build.cc @@ -84,7 +84,6 @@ void BuildStatus::BuildEdgeFinished(Edge* edge, RunningEdgeMap::iterator i = running_edges_.find(edge); *start_time = i->second; *end_time = (int)(now - start_time_millis_); - int total_time = end_time - start_time; running_edges_.erase(i); if (config_.verbosity == BuildConfig::QUIET) @@ -93,14 +92,7 @@ void BuildStatus::BuildEdgeFinished(Edge* edge, if (smart_terminal_) PrintStatus(edge); - if (success && output.empty()) { - if (!smart_terminal_) { - if (total_time > 5*1000) { - printf("%.1f%% %d/%d\n", finished_edges_ * 100 / (float)total_edges_, - finished_edges_, total_edges_); - } - } - } else { + if (!success || !output.empty()) { if (smart_terminal_) printf("\n"); |