Merge pull request #160 from oli-obk/master

Also test subdirectories of `rust/src/test/run-pass`
rust-lang · Apr 25, 2017 · c0d2d01 · c0d2d01
2 parents 7676847 + df9440d
commit c0d2d01
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/tests/compiletest.rs b/tests/compiletest.rs
@@ -92,9 +92,17 @@ fn compile_test() {
         let mut unsupported = Vec::new();
         let mut unimplemented_intrinsic = Vec::new();
         let mut limits = Vec::new();
-        for file in std::fs::read_dir(path).unwrap() {
+        let mut files: Vec<_> = std::fs::read_dir(path).unwrap().collect();
+        while let Some(file) = files.pop() {
             let file = file.unwrap();
             let path = file.path();
+            if file.metadata().unwrap().is_dir() {
+                if !path.to_str().unwrap().ends_with("auxiliary") {
+                    // add subdirs recursively
+                    files.extend(std::fs::read_dir(path).unwrap());
+                }
+                continue;
+            }
             if !file.metadata().unwrap().is_file() || !path.to_str().unwrap().ends_with(".rs") {
                 continue;
             }