diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-05-16 12:50:40 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-05-16 16:48:48 -0400 |
| commit | 24cfa1efb0385ede414d47a4a59f7673045151dc (patch) | |
| tree | 257accebbe235d629656dade072d6c65afbf1f70 | |
| parent | 3ff521bdb504f8cd6f9415a6dc914d7b383955e5 (diff) | |
| download | rust-24cfa1efb0385ede414d47a4a59f7673045151dc.tar.gz rust-24cfa1efb0385ede414d47a4a59f7673045151dc.zip | |
pacify the mercilous tidy
| -rwxr-xr-x | src/test/ui/update-all-references.sh | 10 | ||||
| -rwxr-xr-x | src/test/ui/update-references.sh | 11 | ||||
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/test/ui/update-all-references.sh b/src/test/ui/update-all-references.sh index cae2a2dba4c..ddd69c399a5 100755 --- a/src/test/ui/update-all-references.sh +++ b/src/test/ui/update-all-references.sh @@ -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 diff --git a/src/test/ui/update-references.sh b/src/test/ui/update-references.sh index 703f3f3342b..f0a6f8a3d44 100755 --- a/src/test/ui/update-references.sh +++ b/src/test/ui/update-references.sh @@ -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 @@ -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 diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index d97e96da16d..a213c6d2d54 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -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)) } } } |
