Auto merge of #21997 - Manishearth:rollup, r=alexcrichton

None

1 files changed, 4 insertions, 1 deletions

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index e3e7ca76911..e6d2a691cf5 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -118,7 +118,10 @@ pub fn parse_config(args: Vec<String> ) -> Config {
     }
 
     fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
-        Path::new(m.opt_str(nm).unwrap())
+        match m.opt_str(nm) {
+            Some(s) => Path::new(s),
+            None => panic!("no option (=path) found for {}", nm),
+        }
     }
 
     let filter = if !matches.free.is_empty() {