---

yaml
---
r: 79434
b: refs/heads/snap-stage3
c: 507414d
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ba3ce3262749a400e290d19161849c5351c1e726
+refs/heads/snap-stage3: 507414daf9ed9a91ba04e3715f02353e31411a0c
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -823,7 +823,7 @@ do
         index2="${CFG_SRC_DIR}src/llvm/.git/index"
         for index in ${index1} ${index2}
         do
-            config_status="${LLVM_BUILD_DIR}/config.status"
+            config_status="${CFG_BUILD_DIR}llvm/$t/config.status"
             if test -e ${index} -a \
                     -e ${config_status} -a \
                     ${config_status} -nt ${index}

branches/snap-stage3/mk/clean.mk

@@ -50,7 +50,7 @@ clean-misc:
 	$(Q)rm -f $(RUSTLLVM_LIB_OBJS) $(RUSTLLVM_OBJS_OBJS) $(RUSTLLVM_DEF)
 	$(Q)rm -Rf $(DOCS)
 	$(Q)rm -Rf $(GENERATED)
-	$(Q)rm -f tmp/*
+	$(Q)rm -Rf tmp/*
 	$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
 	$(Q)rm -Rf $(foreach ext, \
                  html aux cp fn ky log pdf pg toc tp vr cps, \

branches/snap-stage3/src/libextra/glob.rs

@@ -448,11 +448,21 @@ impl MatchOptions {
 #[cfg(test)]
 mod test {
     use std::{io, os, unstable};
+    use std::unstable::finally::Finally;
     use super::*;
+    use tempfile;
 
     #[test]
     fn test_relative_pattern() {
 
+        fn change_then_remove(p: &Path, f: &fn()) {
+            do (|| {
+                unstable::change_dir_locked(p, || f());
+            }).finally {
+                os::remove_dir_recursive(p);
+            }
+        }
+
         fn mk_file(path: &str, directory: bool) {
             if directory {
                 os::make_dir(&Path(path), 0xFFFF);
@@ -469,10 +479,10 @@ mod test {
             glob(pattern).collect()
         }
 
-        mk_file("tmp", true);
-        mk_file("tmp/glob-tests", true);
+        let root = tempfile::mkdtemp(&os::tmpdir(), "glob-tests");
+        let root = root.expect("Should have created a temp directory");
 
-        do unstable::change_dir_locked(&Path("tmp/glob-tests")) {
+        do change_then_remove(&root) {
 
             mk_file("aaa", true);
             mk_file("aaa/apple", true);