Skip to content

Commit

Permalink
pacify the mercilous tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
nikomatsakis committed May 16, 2016
1 parent 3ff521b commit 24cfa1e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 2 deletions.
10 changes: 10 additions & 0 deletions src/test/ui/update-all-references.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
#!/bin/bash
#
# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.

# A script to update the references for all tests. The idea is that
# you do a run, which will generate files in the build directory
Expand Down
11 changes: 10 additions & 1 deletion src/test/ui/update-references.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
#!/bin/bash
#
# Copyright 2015 The Rust Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.

# A script to update the references for particular tests. The idea is
# that you do a run, which will generate files in the build directory
Expand Down Expand Up @@ -30,7 +40,6 @@ while [[ "$1" != "" ]]; do
echo updating $MYDIR/$STDOUT_NAME
cp $BUILD_DIR/$STDOUT_NAME $MYDIR/$STDOUT_NAME
fi

if [ -f $BUILD_DIR/$STDERR_NAME ] && \
! (diff $BUILD_DIR/$STDERR_NAME $MYDIR/$STDERR_NAME > /dev/null); then
echo updating $MYDIR/$STDERR_NAME
Expand Down
3 changes: 2 additions & 1 deletion src/tools/compiletest/src/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2159,7 +2159,8 @@ actual:\n\
match File::open(path).and_then(|mut f| f.read_to_string(&mut result)) {
Ok(_) => result,
Err(e) => {
self.fatal(&format!("failed to load expected output from `{}`: {}", path.display(), e))
self.fatal(&format!("failed to load expected output from `{}`: {}",
path.display(), e))
}
}
}
Expand Down

0 comments on commit 24cfa1e

Please sign in to comment.