Fixes failing tests.

* Rearranges error-checking in `install_from_dir` to pass the tests
  `custom_invalid_names` and `custom_invalid_names_with_archive_dates`.
* Adds subdirectory `lib` to custom directories to pass the tests
  `custom_toolchain_cargo_fallback_proxy` and
  `custom_toolchain_cargo_fallback_run`.
* Expect a missing directory error for `lib` in `emptydir`to pass
  `rustup_failed_search_path`.

Author: theindigamer

src/rustup-mock/src/clitools.rs

@@ -693,6 +693,8 @@ fn mock_bin(_name: &str, version: &str, version_hash: &str) -> Vec<u8> {
 fn create_custom_toolchains(customdir: &Path) {
     let ref dir = customdir.join("custom-1/bin");
     fs::create_dir_all(dir).unwrap();
+    let ref dir = customdir.join("custom-1/lib");
+    fs::create_dir_all(dir).unwrap();
     let rustc = mock_bin("rustc", "1.0.0", "hash-c-1");
     let ref path = customdir.join(format!("custom-1/bin/rustc{}", EXE_SUFFIX));
     let mut file = File::create(path).unwrap();
@@ -701,6 +703,8 @@ fn create_custom_toolchains(customdir: &Path) {
 
     let ref dir = customdir.join("custom-2/bin");
     fs::create_dir_all(dir).unwrap();
+    let ref dir = customdir.join("custom-2/lib");
+    fs::create_dir_all(dir).unwrap();
     let rustc = mock_bin("rustc", "1.0.0", "hash-c-2");
     let ref path = customdir.join(format!("custom-2/bin/rustc{}", EXE_SUFFIX));
     let mut file = File::create(path).unwrap();

src/rustup/toolchain.rs

@@ -273,6 +273,14 @@ impl<'a> Toolchain<'a> {
     }
 
     pub fn install_from_dir(&self, src: &Path, link: bool) -> Result<()> {
+        try!(self.ensure_custom());
+
+        if link {
+            try!(self.install(InstallMethod::Link(&try!(utils::to_absolute(src)))));
+        } else {
+            try!(self.install(InstallMethod::Copy(src)));
+        }
+
         let mut pathbuf = PathBuf::from(src);
 
         pathbuf.push("lib");
@@ -283,14 +291,6 @@ impl<'a> Toolchain<'a> {
         pathbuf.push("rustc");
         try!(utils::assert_is_file(&pathbuf));
 
-        try!(self.ensure_custom());
-
-        if link {
-            try!(self.install(InstallMethod::Link(&try!(utils::to_absolute(src)))));
-        } else {
-            try!(self.install(InstallMethod::Copy(src)));
-        }
-
         Ok(())
     }
 

tests/cli-misc.rs

@@ -306,7 +306,9 @@ fn rustup_failed_path_search() {
         let ref tool_path = config.exedir.join(&format!("fake_proxy{}", EXE_SUFFIX));
         utils::hardlink_file(rustup_path, tool_path).expect("Failed to create fake proxy for test");
 
-        expect_ok(config, &["rustup", "toolchain", "link", "empty", &config.emptydir.to_string_lossy()]);
+        expect_err(config,
+                   &["rustup", "toolchain", "link", "empty", &config.emptydir.to_string_lossy()],
+                   &format!("error: not a directory: '{}'", config.emptydir.join("lib").display()));
         let broken = &["rustup", "run", "empty", "fake_proxy"];
         expect_err(config, broken, &format!(
             "toolchain 'empty' does not have the binary `fake_proxy{}`", EXE_SUFFIX