---

yaml
---
r: 140799
b: refs/heads/try2
c: 133aabc
h: refs/heads/master
i:
  140797: 70dd1c2
  140795: 48433ac
  140791: c279acd
  140783: 1f2df6b
  140767: 96507ee
  140735: 9cd40f6
  140671: d49bf29
  140543: 3f667cc
  140287: 29fb8da
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 06c46d514215e38a800dce1aa1913589eeb03b20
+refs/heads/try2: 133aabc5bb6786ff7038886baf5fefde974e460a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/configure

@@ -695,9 +695,6 @@ do
             # host lib dir
             make_dir $h/stage$i/$CFG_LIBDIR
 
-            # host test dir
-            make_dir $h/stage$i/test
-
             # target bin dir
             make_dir $h/stage$i/$CFG_LIBDIR/rustc/$t/bin
 

branches/try2/mk/tests.mk

@@ -289,50 +289,50 @@ else
 STDTESTDEP_$(1)_$(2)_$(3) =
 endif
 
-$(3)/stage$(1)/test/coretest-$(2)$$(X_$(2)):			\
+$(3)/test/coretest.stage$(1)-$(2)$$(X_$(2)):			\
 		$$(CORELIB_CRATE) $$(CORELIB_INPUTS)	\
 		$$(STDTESTDEP_$(1)_$(2)_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/stdtest-$(2)$$(X_$(2)):			\
+$(3)/test/stdtest.stage$(1)-$(2)$$(X_$(2)):			\
 		$$(STDLIB_CRATE) $$(STDLIB_INPUTS)	\
 		$$(STDTESTDEP_$(1)_$(2)_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/syntaxtest-$(2)$$(X_$(2)):			\
+$(3)/test/syntaxtest.stage$(1)-$(2)$$(X_$(2)):			\
 		$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS)	\
 		$$(STDTESTDEP_$(1)_$(2)_$(3))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/rustctest-$(2)$$(X_$(2)):					\
+$(3)/test/rustctest.stage$(1)-$(2)$$(X_$(2)):					\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM_$(2)) \
                 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX_$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/rustpkgtest-$(2)$$(X_$(2)):					\
+$(3)/test/rustpkgtest.stage$(1)-$(2)$$(X_$(2)):					\
 		$$(RUSTPKG_LIB) $$(RUSTPKG_INPUTS)		\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/rustitest-$(2)$$(X_$(2)):					\
+$(3)/test/rustitest.stage$(1)-$(2)$$(X_$(2)):					\
 		$$(RUSTI_LIB) $$(RUSTI_INPUTS)		\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/rusttest-$(2)$$(X_$(2)):					\
+$(3)/test/rusttest.stage$(1)-$(2)$$(X_$(2)):					\
 		$$(RUST_LIB) $$(RUST_INPUTS)		\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test
 
-$(3)/stage$(1)/test/rustdoctest-$(2)$$(X_$(2)):					\
+$(3)/test/rustdoctest.stage$(1)-$(2)$$(X_$(2)):					\
 		$$(RUSTDOC_LIB) $$(RUSTDOC_INPUTS)		\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC_$(2))
 	@$$(call E, compile_and_link: $$@)
@@ -349,7 +349,7 @@ define DEF_TEST_CRATE_RULES
 check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
 
 $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
-		$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
+		$(3)/test/$(4)test.stage$(1)-$(2)$$(X_$(2))
 	@$$(call E, run: $$<)
 	$$(Q)$$(call CFG_RUN_TEST_$(2),$$<,$(2),$(3)) $$(TESTARGS)	\
 	--logfile $$(call TEST_LOG_FILE,$(1),$(2),$(3),$(4)) \
@@ -360,7 +360,7 @@ define DEF_TEST_CRATE_RULES_arm-linux-androideabi
 check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
 
 $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
-		$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
+		$(3)/test/$(4)test.stage$(1)-$(2)$$(X_$(2))
 	@$$(call E, run: $$< via adb)
 	@$(CFG_ADB) push $$< $(CFG_ADB_TEST_DIR)
 	@$(CFG_ADB) shell LD_LIBRARY_PATH=$(CFG_ADB_TEST_DIR) \
@@ -385,7 +385,7 @@ define DEF_TEST_CRATE_RULES_null
 check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4))
 
 $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \
-		$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2))
+		$(3)/test/$(4)test.stage$(1)-$(2)$$(X_$(2))
 	@$$(call E, run: skipped $$< )
 	@touch $$@
 endef

branches/try2/src/librusti/rusti.rc

@@ -35,7 +35,7 @@ use std::rl;
  * A structure shared across REPL instances for storing history
  * such as statements and view items. I wish the AST was sendable.
  */
-pub struct Repl {
+struct Repl {
     prompt: ~str,
     binary: ~str,
     running: bool,
@@ -122,7 +122,7 @@ fn run(repl: Repl, input: ~str) -> Repl {
 
     debug!("building driver input");
     let head = include_str!("wrapper.rs").to_owned();
-    let foot = fmt!("fn main() {\n%s\n%s\n\nprint({\n%s\n})\n}",
+    let foot = fmt!("%s\nfn main() {\n%s\n\nprint({\n%s\n})\n}",
                     repl.view_items, repl.stmts, input);
     let wrapped = driver::str_input(head + foot);
 
@@ -328,8 +328,8 @@ fn run_cmd(repl: &mut Repl, _in: @io::Reader, _out: @io::Writer,
 
 /// Executes a line of input, which may either be rust code or a
 /// :command. Returns a new Repl if it has changed.
-pub fn run_line(repl: &mut Repl, in: @io::Reader, out: @io::Writer, line: ~str,
-                use_rl: bool)
+fn run_line(repl: &mut Repl, in: @io::Reader, out: @io::Writer, line: ~str,
+            use_rl: bool)
     -> Option<Repl> {
     if line.starts_with(":") {
         let full = line.substr(1, line.len() - 1);
@@ -421,52 +421,3 @@ pub fn main() {
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn repl() -> Repl {
-        Repl {
-            prompt: ~"rusti> ",
-            binary: ~"rusti",
-            running: true,
-            view_items: ~"",
-            lib_search_paths: ~[],
-            stmts: ~""
-        }
-    }
-
-    fn run_cmds(cmds: &[&str]) {
-        let mut r = repl();
-        for cmds.each |&cmd| {
-            let result = run_line(&mut r, io::stdin(), io::stdout(),
-                                  cmd.to_owned(), false);
-            r = result.expect(fmt!("the command '%s' failed", cmd));
-        }
-    }
-
-    #[test]
-    fn run_all() {
-        // By default, unit tests are run in parallel. Rusti, on the other hand,
-        // does not enjoy doing this. I suspect that it is because the LLVM
-        // bindings are not thread-safe (when running parallel tests, some tests
-        // were triggering assertions in LLVM (or segfaults). Hence, this
-        // function exists to run everything serially (sadface).
-        //
-        // To get some interesting output, run with RUST_LOG=rusti::tests
-
-        debug!("hopefully this runs");
-        run_cmds([""]);
-
-        debug!("regression test for #5937");
-        run_cmds(["use core;", ""]);
-
-        debug!("regression test for #5784");
-        run_cmds(["let a = 1;"]);
-
-        debug!("regression test for #5803");
-        run_cmds(["spawn( || println(\"Please don't segfault\") );",
-                  "do spawn { println(\"Please?\"); }"]);
-    }
-}

branches/try2/src/librusti/wrapper.rs

@@ -18,8 +18,8 @@
 #[allow(unrecognized_lint)];
 #[allow(unused_imports)];
 #[allow(while_true)];
-#[allow(unused_variable)];
 #[allow(dead_assignment)];
+#[allow(unused_variable)];
 #[allow(unused_unsafe)];
 #[allow(unused_mut)];
 

branches/try2/src/librustpkg/tests.rs

@@ -79,10 +79,10 @@ fn is_rwx(p: &Path) -> bool {
 
 fn test_sysroot() -> Path {
     // Totally gross hack but it's just for test cases.
-    // Infer the sysroot from the exe name and pray that it's right.
-    // (Did I mention it was a gross hack?)
+    // Infer the sysroot from the exe name and tack "stage2"
+    // onto it. (Did I mention it was a gross hack?)
     let self_path = os::self_exe_path().expect("Couldn't get self_exe path");
-    self_path.pop()
+    self_path.pop().push("stage2")
 }
 
 #[test]

branches/try2/src/libstd/flatpipes.rs

@@ -639,6 +639,7 @@ mod test {
     use core::io::BytesWriter;
 
     #[test]
+    #[ignore(reason = "ebml failure")]
     fn test_serializing_memory_stream() {
         let writer = BytesWriter();
         let chan = serial::writer_chan(writer);
@@ -671,6 +672,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(reason = "ebml failure")]
     fn test_serializing_boxes() {
         let (port, chan) = serial::pipe_stream();