Auto merge of rust-lang#637 - emilio:headers-dir, r=SimonSapin

build: Don't always expect a tests/headers directory.

It may not exist after packaging. This should unblock publishing bindgen.

Author: bors-servo

build.rs

@@ -28,13 +28,19 @@ mod testgen {
         let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
         let mut dst = File::create(Path::new(&out_dir).join("tests.rs")).unwrap();
 
-        println!("cargo:rerun-if-changed=tests/headers");
         let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
         let headers_dir = manifest_dir.join("tests").join("headers");
 
-        let entries = fs::read_dir(headers_dir)
-            .expect("Couldn't read headers dir")
-            .map(|result| result.expect("Couldn't read header file"));
+        let headers = match fs::read_dir(headers_dir) {
+            Ok(dir) => dir,
+            // We may not have headers directory after packaging.
+            Err(..) => return,
+        };
+
+        let entries =
+            headers.map(|result| result.expect("Couldn't read header file"));
+
+        println!("cargo:rerun-if-changed=tests/headers");
 
         for entry in entries {
             match entry.path().extension().and_then(OsStr::to_str) {