Add setup-toolchain.sh script to configure the master version of rustc,

[rust.git] / ci / base-tests.sh

diff --git a/ci/base-tests.sh b/ci/base-tests.sh
index 377f6957746921f0922df77dbfda91c954288573..3ac6bbe67258c63885b645c02d3582001d2ec19a 100755 (executable)
--- a/ci/base-tests.sh
+++ b/ci/base-tests.sh
@@ -1,14 +1,3 @@
-# Copyright 2014-2018 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.
-
-
 set -ex
 
 echo "Running clippy base tests"
@@ -35,15 +24,12 @@ cd ..
 ./util/dev update_lints --check
 cargo +nightly fmt --all -- --check
 
-
-
-
 # make sure tests are formatted
 
 # some lints are sensitive to formatting, exclude some files
-tests_need_reformatting=false
+tests_need_reformatting="false"
 # switch to nightly
-rustup default nightly
+rustup override set nightly
 # avoid loop spam and allow cmds with exit status != 0
 set +ex
 
@@ -51,16 +37,16 @@ for file in `find tests -not -path "tests/ui/methods.rs" -not -path "tests/ui/fo
   rustfmt ${file} --check
   if [ $? -ne 0 ]; then
     echo "${file} needs reformatting!"
-    tests_need_reformatting=true
+    tests_need_reformatting="true"
   fi
 done
 
 set -ex # reset
 
-if [ ${tests_need_reformatting} ] ; then
+if [ "${tests_need_reformatting}" == "true" ] ; then
     echo "Tests need reformatting!"
     exit 2
 fi
 
 # switch back to master
-rustup default master
+rustup override set master