---

yaml
---
r: 102007
b: refs/heads/master
c: 35c6e22
h: refs/heads/master
i:
  102005: 403b9d5
  102003: 3bbd4a9
  101999: 906ffcf
v: v3

Author: alexcrichton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 47b05278d0679802f271e3f73cb22979dfc229de
+refs/heads/master: 35c6e22fab2d8b9c0911fb795532ca853d124ff1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
 refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/mk/crates.mk

@@ -50,7 +50,7 @@
 ################################################################################
 
 TARGET_CRATES := std extra green rustuv native flate arena glob term semver \
-                 uuid serialize sync getopts collections num test
+                 uuid serialize sync getopts collections num
 HOST_CRATES := syntax rustc rustdoc fourcc
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
@@ -63,8 +63,7 @@ DEPS_native := std
 DEPS_syntax := std term serialize collections
 DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
               collections extra
-DEPS_rustdoc := rustc native:sundown serialize sync getopts collections \
-                test
+DEPS_rustdoc := rustc native:sundown serialize sync getopts collections
 DEPS_flate := std native:miniz
 DEPS_arena := std collections
 DEPS_glob := std
@@ -77,9 +76,8 @@ DEPS_getopts := std
 DEPS_collections := std serialize
 DEPS_fourcc := syntax std
 DEPS_num := std extra
-DEPS_test := std extra collections getopts serialize term
 
-TOOL_DEPS_compiletest := test green rustuv getopts
+TOOL_DEPS_compiletest := extra green rustuv getopts
 TOOL_DEPS_rustdoc := rustdoc green rustuv
 TOOL_DEPS_rustc := rustc green rustuv
 TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs

trunk/mk/tests.mk

@@ -537,10 +537,6 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
 # remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
 CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS))
 
-# There's no need our entire test suite to take up gigabytes of space on disk
-# including copies of libstd/libextra all over the place
-CTEST_RUSTC_FLAGS := $$(CTEST_RUSTC_FLAGS) -C prefer-dynamic
-
 # The tests can not be optimized while the rest of the compiler is optimized, so
 # filter out the optimization (if any) from rustc and then figure out if we need
 # to be optimized

trunk/src/compiletest/compiletest.rs

@@ -13,13 +13,16 @@
 #[allow(non_camel_case_types)];
 #[deny(warnings)];
 
-extern crate test;
+extern crate extra;
 extern crate getopts;
 
 use std::os;
 use std::io;
 use std::io::fs;
+
 use getopts::{optopt, optflag, reqopt};
+use extra::test;
+
 use common::config;
 use common::mode_run_pass;
 use common::mode_run_fail;

trunk/src/compiletest/header.rs

@@ -32,6 +32,8 @@ pub struct TestProps {
     force_host: bool,
     // Check stdout for error-pattern output as well as stderr
     check_stdout: bool,
+    // Don't force a --crate-type=dylib flag on the command line
+    no_prefer_dynamic: bool,
 }
 
 // Load any test directives embedded in the file
@@ -45,6 +47,7 @@ pub fn load_props(testfile: &Path) -> TestProps {
     let mut check_lines = ~[];
     let mut force_host = false;
     let mut check_stdout = false;
+    let mut no_prefer_dynamic = false;
     iter_header(testfile, |ln| {
         match parse_error_pattern(ln) {
           Some(ep) => error_patterns.push(ep),
@@ -67,6 +70,10 @@ pub fn load_props(testfile: &Path) -> TestProps {
             check_stdout = parse_check_stdout(ln);
         }
 
+        if !no_prefer_dynamic {
+            no_prefer_dynamic = parse_no_prefer_dynamic(ln);
+        }
+
         match parse_aux_build(ln) {
             Some(ab) => { aux_builds.push(ab); }
             None => {}
@@ -99,6 +106,7 @@ pub fn load_props(testfile: &Path) -> TestProps {
         check_lines: check_lines,
         force_host: force_host,
         check_stdout: check_stdout,
+        no_prefer_dynamic: no_prefer_dynamic,
     };
 }
 
@@ -167,6 +175,10 @@ fn parse_check_stdout(line: &str) -> bool {
     parse_name_directive(line, "check-stdout")
 }
 
+fn parse_no_prefer_dynamic(line: &str) -> bool {
+    parse_name_directive(line, "no-prefer-dynamic")
+}
+
 fn parse_exec_env(line: &str) -> Option<(~str, ~str)> {
     parse_name_value_directive(line, ~"exec-env").map(|nv| {
         // nv is either FOO or FOO=BAR

trunk/src/compiletest/runtest.rs

@@ -34,7 +34,7 @@ use std::str;
 use std::task;
 use std::vec;
 
-use test::MetricMap;
+use extra::test::MetricMap;
 
 pub fn run(config: config, testfile: ~str) {
 
@@ -704,9 +704,13 @@ fn compose_and_run_compiler(
     for rel_ab in props.aux_builds.iter() {
         let abs_ab = config.aux_base.join(rel_ab.as_slice());
         let aux_props = load_props(&abs_ab);
+        let crate_type = if aux_props.no_prefer_dynamic {
+            ~[]
+        } else {
+            ~[~"--crate-type=dylib"]
+        };
         let aux_args =
-            make_compile_args(config, &aux_props, ~[~"--crate-type=dylib"]
-                                                  + extra_link_args,
+            make_compile_args(config, &aux_props, crate_type + extra_link_args,
                               |a,b| {
                                   let f = make_lib_name(a, b, testfile);
                                   ThisDirectory(f.dir_path())
@@ -770,6 +774,10 @@ fn make_compile_args(config: &config,
                      ~"-L", config.build_base.as_str().unwrap().to_owned(),
                      ~"--target=" + target]
         + extras;
+    if !props.no_prefer_dynamic {
+        args.push(~"-C");
+        args.push(~"prefer-dynamic");
+    }
     let path = match xform_file {
         ThisFile(path) => { args.push(~"-o"); path }
         ThisDirectory(path) => { args.push(~"--out-dir"); path }

trunk/src/doc/guide-testing.md

@@ -170,7 +170,7 @@ runner.
 
 The type signature of a benchmark function differs from a unit test:
 it takes a mutable reference to type
-`test::BenchHarness`. Inside the benchmark function, any
+`extra::test::BenchHarness`. Inside the benchmark function, any
 time-variable or "setup" code should execute first, followed by a call
 to `iter` on the benchmark harness, passing a closure that contains
 the portion of the benchmark you wish to actually measure the
@@ -185,10 +185,9 @@ amount.
 For example:
 
 ~~~
-extern crate test;
-
+extern crate extra;
 use std::vec;
-use test::BenchHarness;
+use extra::test::BenchHarness;
 
 #[bench]
 fn bench_sum_1024_ints(b: &mut BenchHarness) {
@@ -244,8 +243,8 @@ recognize that some calculation has no external effects and remove
 it entirely.
 
 ~~~
-extern crate test;
-use test::BenchHarness;
+extern crate extra;
+use extra::test::BenchHarness;
 
 #[bench]
 fn bench_xor_1000_ints(bh: &mut BenchHarness) {
@@ -274,15 +273,15 @@ example above by adjusting the `bh.iter` call to
 bh.iter(|| range(0, 1000).fold(0, |old, new| old ^ new))
 ~~~
 
-Or, the other option is to call the generic `test::black_box`
+Or, the other option is to call the generic `extra::test::black_box`
 function, which is an opaque "black box" to the optimizer and so
 forces it to consider any argument as used.
 
 ~~~
-extern crate test;
+use extra::test::black_box
 
 bh.iter(|| {
-        test::black_box(range(0, 1000).fold(0, |old, new| old ^ new));
+        black_box(range(0, 1000).fold(0, |old, new| old ^ new));
     });
 ~~~
 

trunk/src/doc/rustdoc.md

@@ -154,7 +154,7 @@ testing this code, the `fib` function will be included (so it can compile).
 
 Running tests often requires some special configuration to filter tests, find
 libraries, or try running ignored examples. The testing framework that rustdoc
-uses is build on crate `test`, which is also used when you compile crates with
+uses is build on `extra::test`, which is also used when you compile crates with
 rustc's `--test` flag. Extra arguments can be passed to rustdoc's test harness
 with the `--test-args` flag.
 

trunk/src/libarena/lib.rs

@@ -503,10 +503,10 @@ impl<T> Drop for TypedArena<T> {
 }
 
 #[cfg(test)]
-mod tests {
-    extern crate test;
-    use self::test::BenchHarness;
+mod test {
+    extern crate extra;
     use super::{Arena, TypedArena};
+    use self::extra::test::BenchHarness;
 
     struct Point {
         x: int,

trunk/src/libcollections/bitv.rs

@@ -938,8 +938,7 @@ impl<'a> Iterator<uint> for BitPositions<'a> {
 
 #[cfg(test)]
 mod tests {
-    extern crate test;
-    use self::test::BenchHarness;
+    use extra::test::BenchHarness;
 
     use bitv::{Bitv, SmallBitv, BigBitv, BitvSet, from_bools, from_fn,
                from_bytes};

trunk/src/libcollections/deque.rs

@@ -41,11 +41,10 @@ pub trait Deque<T> : Mutable {
 
 #[cfg(test)]
 pub mod bench {
-    extern crate test;
-    use self::test::BenchHarness;
     use std::container::MutableMap;
     use std::{vec, rand};
     use std::rand::Rng;
+    use extra::test::BenchHarness;
 
     pub fn insert_rand_n<M:MutableMap<uint,uint>>(n: uint,
                                                   map: &mut M,

trunk/src/libcollections/dlist.rs

@@ -657,9 +657,8 @@ impl<D:Decoder,T:Decodable<D>> Decodable<D> for DList<T> {
 
 #[cfg(test)]
 mod tests {
-    extern crate test;
-    use self::test::BenchHarness;
     use deque::Deque;
+    use extra::test;
     use std::rand;
     use super::{DList, Node, ListInsertion};
 

trunk/src/libcollections/lib.rs

@@ -20,7 +20,7 @@
 #[feature(macro_rules, managed_boxes)];
 
 extern crate serialize;
-#[cfg(test)] extern crate test;
+#[cfg(test)] extern crate extra; // benchmark tests need this
 
 pub use bitv::Bitv;
 pub use btree::BTree;

trunk/src/libcollections/ringbuf.rs

@@ -431,9 +431,8 @@ impl<D:Decoder,T:Decodable<D>> Decodable<D> for RingBuf<T> {
 
 #[cfg(test)]
 mod tests {
-    extern crate test;
-    use self::test::BenchHarness;
     use deque::Deque;
+    use extra::test;
     use std::clone::Clone;
     use std::cmp::Eq;
     use super::RingBuf;

trunk/src/libcollections/smallintmap.rs

@@ -470,9 +470,9 @@ mod test_map {
 
 #[cfg(test)]
 mod bench {
-    extern crate test;
-    use self::test::BenchHarness;
+
     use super::SmallIntMap;
+    use extra::test::BenchHarness;
     use deque::bench::{insert_rand_n, insert_seq_n, find_rand_n, find_seq_n};
 
     // Find seq

trunk/src/libcollections/treemap.rs

@@ -1494,9 +1494,9 @@ mod test_treemap {
 
 #[cfg(test)]
 mod bench {
-    extern crate test;
-    use self::test::BenchHarness;
+
     use super::TreeMap;
+    use extra::test::BenchHarness;
     use deque::bench::{insert_rand_n, insert_seq_n, find_rand_n, find_seq_n};
 
     // Find seq

trunk/src/libextra/lib.rs

@@ -36,10 +36,15 @@ Rust extras are part of the standard Rust distribution.
 
 extern crate sync;
 extern crate serialize;
+
 extern crate collections;
 
 // Utility modules
+
 pub mod c_vec;
+
+// And ... other stuff
+
 pub mod url;
 pub mod json;
 pub mod tempfile;
@@ -51,11 +56,15 @@ pub mod stats;
 #[cfg(unicode)]
 mod unicode;
 
+// Compiler support modules
+
+pub mod test;
+
 // A curious inner-module that's not exported that contains the binding
 // 'extra' so that macro-expanded references to extra::serialize and such
 // can be resolved within libextra.
 #[doc(hidden)]
 pub mod extra {
     pub use serialize;
+    pub use test;
 }
-

trunk/src/libextra/stats.rs

@@ -1025,8 +1025,7 @@ mod tests {
 
 #[cfg(test)]
 mod bench {
-    extern crate test;
-    use self::test::BenchHarness;
+    use extra::test::BenchHarness;
     use std::vec;
     use stats::Stats;