Skip to content

Commit

Permalink
Auto merge of #1258 - gnzlbg:docs, r=gnzlbg
Browse files Browse the repository at this point in the history
Re-enable debug output in dox.sh and remove unused variable in runtest
  • Loading branch information
bors committed Feb 13, 2019
2 parents 6153363 + a423d87 commit 9a9e2e0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions ci/dox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ line=$(grep -n '<div class="platform_docs"></div>' $README | cut -d ":" -f 1)

set +x
{ head -n "$((line-1))" $README; cat $PLATFORM_SUPPORT; tail -n "+$((line+1))" $README; } > $TARGET_DOC_DIR/$README
set -x

# If we're on travis, not a PR, and on the right branch, publish!
if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_BRANCH" = "master" ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/runtest-android.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fn main() {
String::from_utf8_lossy(&output.stderr));

let stdout = String::from_utf8_lossy(&output.stdout);
let passed = stdout.lines().find(|l|
stdout.lines().find(|l|
(l.starts_with("PASSED ") && l.contains(" tests")) ||
l.starts_with("test result: ok")
).unwrap_or_else(|| {
Expand Down

0 comments on commit 9a9e2e0

Please sign in to comment.