Implement the translation item collector.

[rust.git] / src / compiletest / common.rs

diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index fe556cecef6981eef5b856bb40ccc48d3250c272..e66094dc3954b9d4bf7c13a0e8c3b6f3980e9373 100644 (file)
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -23,7 +23,9 @@ pub enum Mode {
     Pretty,
     DebugInfoGdb,
     DebugInfoLldb,
-    Codegen
+    Codegen,
+    Rustdoc,
+    CodegenUnits
 }
 
 impl FromStr for Mode {
@@ -39,6 +41,8 @@ fn from_str(s: &str) -> Result<Mode, ()> {
           "debuginfo-lldb" => Ok(DebugInfoLldb),
           "debuginfo-gdb" => Ok(DebugInfoGdb),
           "codegen" => Ok(Codegen),
+          "rustdoc" => Ok(Rustdoc),
+          "codegen-units" => Ok(CodegenUnits),
           _ => Err(()),
         }
     }
@@ -56,6 +60,8 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
             DebugInfoGdb => "debuginfo-gdb",
             DebugInfoLldb => "debuginfo-lldb",
             Codegen => "codegen",
+            Rustdoc => "rustdoc",
+            CodegenUnits => "codegen-units",
         }, f)
     }
 }
@@ -71,8 +77,11 @@ pub struct Config {
     // The rustc executable
     pub rustc_path: PathBuf,
 
-    // The clang executable
-    pub clang_path: Option<PathBuf>,
+    // The rustdoc executable
+    pub rustdoc_path: PathBuf,
+
+    // The python executable
+    pub python: String,
 
     // The llvm binaries path
     pub llvm_bin_path: Option<PathBuf>,
@@ -118,9 +127,6 @@ pub struct Config {
     // Flags to pass to the compiler when building for the target
     pub target_rustcflags: Option<String>,
 
-    // Run tests using the JIT
-    pub jit: bool,
-
     // Target system to be tested
     pub target: String,