---

yaml
---
r: 142783
b: refs/heads/try2
c: 1796373
h: refs/heads/master
i:
  142781: 687d85a
  142779: e6fafa3
  142775: c8bd5e3
  142767: 2850edf
  142751: f625fbb
  142719: f1b31e1
v: v3

Author: glinscott

[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: d56c9762a363abb5e98f31e43381005863414795
+refs/heads/try2: 179637304a5d913a7ea2dc13cffed6e53f342377
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/configure

@@ -731,7 +731,6 @@ do
     make_dir $h/test/perf
     make_dir $h/test/pretty
     make_dir $h/test/debug-info
-    make_dir $h/test/codegen
     make_dir $h/test/doc-tutorial
     make_dir $h/test/doc-tutorial-ffi
     make_dir $h/test/doc-tutorial-macros

branches/try2/mk/tests.mk

@@ -246,7 +246,6 @@ check-stage$(1)-T-$(2)-H-$(3)-exec:     				\
         check-stage$(1)-T-$(2)-H-$(3)-crates-exec                      \
 	check-stage$(1)-T-$(2)-H-$(3)-bench-exec			\
 	check-stage$(1)-T-$(2)-H-$(3)-debuginfo-exec \
-	check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \
 	check-stage$(1)-T-$(2)-H-$(3)-doc-exec \
 	check-stage$(1)-T-$(2)-H-$(3)-pretty-exec
 
@@ -431,8 +430,6 @@ CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
 BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
 PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
 DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
-CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
-CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
 
 # perf tests are the same as bench tests only they run under
 # a performance monitor.
@@ -446,7 +443,6 @@ BENCH_TESTS := $(BENCH_RS)
 PERF_TESTS := $(PERF_RS)
 PRETTY_TESTS := $(PRETTY_RS)
 DEBUGINFO_TESTS := $(DEBUGINFO_RS)
-CODEGEN_TESTS := $(CODEGEN_RS) $(CODEGEN_CC)
 
 CTEST_SRC_BASE_rpass = run-pass
 CTEST_BUILD_BASE_rpass = run-pass
@@ -483,19 +479,10 @@ CTEST_BUILD_BASE_debuginfo = debug-info
 CTEST_MODE_debuginfo = debug-info
 CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL)
 
-CTEST_SRC_BASE_codegen = codegen
-CTEST_BUILD_BASE_codegen = codegen
-CTEST_MODE_codegen = codegen
-CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL)
-
 ifeq ($(CFG_GDB),)
 CTEST_DISABLE_debuginfo = "no gdb found"
 endif
 
-ifeq ($(CFG_CLANG),)
-CTEST_DISABLE_codegen = "no clang found"
-endif
-
 ifeq ($(CFG_OSTYPE),apple-darwin)
 CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
 endif
@@ -520,8 +507,6 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) :=						\
 		--compile-lib-path $$(HLIB$(1)_H_$(3))				\
         --run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3))			\
         --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))			\
-        --clang-path $(if $(CFG_CLANG),$(CFG_CLANG),clang) \
-        --llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD_TRIPLE))/bin \
         --aux-base $$(S)src/test/auxiliary/                 \
         --stage-id stage$(1)-$(2)							\
         --target $(2)                                       \
@@ -537,7 +522,6 @@ CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
 CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
 CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
 CTEST_DEPS_debuginfo_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_TESTS)
-CTEST_DEPS_codegen_$(1)-T-$(2)-H-$(3) = $$(CODEGEN_TESTS)
 
 endef
 
@@ -581,7 +565,7 @@ endif
 
 endef
 
-CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
+CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo
 
 $(foreach host,$(CFG_HOST_TRIPLES), \
  $(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
@@ -690,7 +674,6 @@ TEST_GROUPS = \
 	bench \
 	perf \
 	debuginfo \
-	codegen \
 	doc \
 	$(foreach docname,$(DOC_TEST_NAMES),doc-$(docname)) \
 	pretty \

branches/try2/src/compiletest/common.rs

@@ -15,7 +15,6 @@ pub enum mode {
     mode_run_pass,
     mode_pretty,
     mode_debug_info,
-    mode_codegen
 }
 
 pub struct config {
@@ -28,12 +27,6 @@ pub struct config {
     // The rustc executable
     rustc_path: Path,
 
-    // The clang executable
-    clang_path: Option<Path>,
-
-    // The llvm binaries path
-    llvm_bin_path: Option<Path>,
-
     // The directory containing the tests to run
     src_base: Path,
 

branches/try2/src/compiletest/compiletest.rs

@@ -19,7 +19,6 @@ extern mod extra;
 use std::os;
 
 use extra::getopts;
-use extra::getopts::groups::{optopt, optflag, reqopt};
 use extra::test;
 
 use common::config;
@@ -28,7 +27,6 @@ use common::mode_run_fail;
 use common::mode_compile_fail;
 use common::mode_pretty;
 use common::mode_debug_info;
-use common::mode_codegen;
 use common::mode;
 use util::logv;
 
@@ -47,54 +45,31 @@ pub fn main() {
 }
 
 pub fn parse_config(args: ~[~str]) -> config {
-
-    let groups : ~[getopts::groups::OptGroup] =
-        ~[reqopt("", "compile-lib-path", "path to host shared libraries", "PATH"),
-          reqopt("", "run-lib-path", "path to target shared libraries", "PATH"),
-          reqopt("", "rustc-path", "path to rustc to use for compiling", "PATH"),
-          optopt("", "clang-path", "path to  executable for codegen tests", "PATH"),
-          optopt("", "llvm-bin-path", "path to directory holding llvm binaries", "DIR"),
-          reqopt("", "src-base", "directory to scan for test files", "PATH"),
-          reqopt("", "build-base", "directory to deposit test outputs", "PATH"),
-          reqopt("", "aux-base", "directory to find auxiliary test files", "PATH"),
-          reqopt("", "stage-id", "the target-stage identifier", "stageN-TARGET"),
-          reqopt("", "mode", "which sort of compile tests to run",
-                 "(compile-fail|run-fail|run-pass|pretty|debug-info)"),
-          optflag("", "ignored", "run tests marked as ignored / xfailed"),
-          optopt("", "runtool", "supervisor program to run tests under \
-                                 (eg. emulator, valgrind)", "PROGRAM"),
-          optopt("", "rustcflags", "flags to pass to rustc", "FLAGS"),
-          optflag("", "verbose", "run tests verbosely, showing all output"),
-          optopt("", "logfile", "file to log test execution to", "FILE"),
-          optflag("", "jit", "run tests under the JIT"),
-          optflag("", "newrt", "run tests on the new runtime / scheduler"),
-          optopt("", "target", "the target to build for", "TARGET"),
-          optopt("", "adb-path", "path to the android debugger", "PATH"),
-          optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
-          optflag("h", "help", "show this message"),
+    let opts =
+        ~[getopts::reqopt("compile-lib-path"),
+          getopts::reqopt("run-lib-path"),
+          getopts::reqopt("rustc-path"), getopts::reqopt("src-base"),
+          getopts::reqopt("build-base"), getopts::reqopt("aux-base"),
+          getopts::reqopt("stage-id"),
+          getopts::reqopt("mode"), getopts::optflag("ignored"),
+          getopts::optopt("runtool"), getopts::optopt("rustcflags"),
+          getopts::optflag("verbose"),
+          getopts::optopt("logfile"),
+          getopts::optflag("jit"),
+          getopts::optflag("newrt"),
+          getopts::optopt("target"),
+          getopts::optopt("adb-path"),
+          getopts::optopt("adb-test-dir")
          ];
 
     assert!(!args.is_empty());
-    let argv0 = copy args[0];
     let args_ = args.tail();
-    if args[1] == ~"-h" || args[1] == ~"--help" {
-        let message = fmt!("Usage: %s [OPTIONS] [TESTNAME...]", argv0);
-        println(getopts::groups::usage(message, groups));
-        fail!()
-    }
-
     let matches =
-        &match getopts::groups::getopts(args_, groups) {
+        &match getopts::getopts(args_, opts) {
           Ok(m) => m,
           Err(f) => fail!(getopts::fail_str(f))
         };
 
-    if getopts::opt_present(matches, "h") || getopts::opt_present(matches, "help") {
-        let message = fmt!("Usage: %s [OPTIONS]  [TESTNAME...]", argv0);
-        println(getopts::groups::usage(message, groups));
-        fail!()
-    }
-
     fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
         Path(getopts::opt_str(m, nm))
     }
@@ -103,8 +78,6 @@ pub fn parse_config(args: ~[~str]) -> config {
         compile_lib_path: getopts::opt_str(matches, "compile-lib-path"),
         run_lib_path: getopts::opt_str(matches, "run-lib-path"),
         rustc_path: opt_path(matches, "rustc-path"),
-        clang_path: getopts::opt_maybe_str(matches, "clang-path").map(|s| Path(*s)),
-        llvm_bin_path: getopts::opt_maybe_str(matches, "llvm-bin-path").map(|s| Path(*s)),
         src_base: opt_path(matches, "src-base"),
         build_base: opt_path(matches, "build-base"),
         aux_base: opt_path(matches, "aux-base"),
@@ -186,7 +159,6 @@ pub fn str_mode(s: ~str) -> mode {
       ~"run-pass" => mode_run_pass,
       ~"pretty" => mode_pretty,
       ~"debug-info" => mode_debug_info,
-      ~"codegen" => mode_codegen,
       _ => fail!("invalid mode")
     }
 }
@@ -198,7 +170,6 @@ pub fn mode_str(mode: mode) -> ~str {
       mode_run_pass => ~"run-pass",
       mode_pretty => ~"pretty",
       mode_debug_info => ~"debug-info",
-      mode_codegen => ~"codegen",
     }
 }
 
@@ -216,9 +187,8 @@ pub fn test_opts(config: &config) -> test::TestOpts {
         logfile: copy config.logfile,
         run_tests: true,
         run_benchmarks: false,
-        ratchet_metrics: None,
-        ratchet_noise_percent: None,
-        save_metrics: None,
+        save_results: None,
+        compare_results: None
     }
 }
 

branches/try2/src/compiletest/runtest.rs

@@ -39,8 +39,7 @@ pub fn run(config: config, testfile: ~str) {
       mode_run_fail => run_rfail_test(&config, &props, &testfile),
       mode_run_pass => run_rpass_test(&config, &props, &testfile),
       mode_pretty => run_pretty_test(&config, &props, &testfile),
-      mode_debug_info => run_debuginfo_test(&config, &props, &testfile),
-      mode_codegen => run_codegen_test(&config, &props, &testfile)
+      mode_debug_info => run_debuginfo_test(&config, &props, &testfile)
     }
 }
 
@@ -836,118 +835,3 @@ fn _arm_push_aux_shared_library(config: &config, testfile: &Path) {
         }
     }
 }
-
-// codegen tests (vs. clang)
-
-fn make_o_name(config: &config, testfile: &Path) -> Path {
-    output_base_name(config, testfile).with_filetype("o")
-}
-
-fn append_suffix_to_stem(p: &Path, suffix: &str) -> Path {
-    if suffix.len() == 0 {
-        copy *p
-    } else {
-        let stem = p.filestem().get();
-        p.with_filestem(stem + "-" + suffix)
-    }
-}
-
-fn compile_test_and_save_bitcode(config: &config, props: &TestProps,
-                                 testfile: &Path) -> ProcRes {
-    let link_args = ~[~"-L", aux_output_dir_name(config, testfile).to_str()];
-    let llvm_args = ~[~"-c", ~"--lib", ~"--save-temps"];
-    let args = make_compile_args(config, props,
-                                 link_args + llvm_args,
-                                 make_o_name, testfile);
-    compose_and_run_compiler(config, props, testfile, args, None)
-}
-
-fn compile_cc_with_clang_and_save_bitcode(config: &config, _props: &TestProps,
-                                          testfile: &Path) -> ProcRes {
-    let bitcodefile = output_base_name(config, testfile).with_filetype("bc");
-    let bitcodefile = append_suffix_to_stem(&bitcodefile, "clang");
-    let ProcArgs = ProcArgs {
-        prog: config.clang_path.get_ref().to_str(),
-        args: ~[~"-c",
-                ~"-emit-llvm",
-                ~"-o", bitcodefile.to_str(),
-                testfile.with_filetype("cc").to_str() ]
-    };
-    compose_and_run(config, testfile, ProcArgs, ~[], "", None)
-}
-
-fn extract_function_from_bitcode(config: &config, _props: &TestProps,
-                                 fname: &str, testfile: &Path,
-                                 suffix: &str) -> ProcRes {
-    let bitcodefile = output_base_name(config, testfile).with_filetype("bc");
-    let bitcodefile = append_suffix_to_stem(&bitcodefile, suffix);
-    let extracted_bc = append_suffix_to_stem(&bitcodefile, "extract");
-    let ProcArgs = ProcArgs {
-        prog: config.llvm_bin_path.get_ref().push("llvm-extract").to_str(),
-        args: ~[~"-func=" + fname,
-                ~"-o=" + extracted_bc.to_str(),
-                bitcodefile.to_str() ]
-    };
-    compose_and_run(config, testfile, ProcArgs, ~[], "", None)
-}
-
-fn disassemble_extract(config: &config, _props: &TestProps,
-                       testfile: &Path, suffix: &str) -> ProcRes {
-    let bitcodefile = output_base_name(config, testfile).with_filetype("bc");
-    let bitcodefile = append_suffix_to_stem(&bitcodefile, suffix);
-    let extracted_bc = append_suffix_to_stem(&bitcodefile, "extract");
-    let extracted_ll = extracted_bc.with_filetype("ll");
-    let ProcArgs = ProcArgs {
-        prog: config.llvm_bin_path.get_ref().push("llvm-dis").to_str(),
-        args: ~[~"-o=" + extracted_ll.to_str(),
-                extracted_bc.to_str() ]
-    };
-    compose_and_run(config, testfile, ProcArgs, ~[], "", None)
-}
-
-
-fn run_codegen_test(config: &config, props: &TestProps, testfile: &Path) {
-
-    if config.llvm_bin_path.is_none() {
-        fatal(~"missing --llvm-bin-path");
-    }
-
-    if config.clang_path.is_none() {
-        fatal(~"missing --clang-path");
-    }
-
-    let mut ProcRes = compile_test_and_save_bitcode(config, props, testfile);
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"compilation failed!", &ProcRes);
-    }
-
-    ProcRes = extract_function_from_bitcode(config, props, "test", testfile, "");
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"extracting 'test' function failed", &ProcRes);
-    }
-
-    ProcRes = disassemble_extract(config, props, testfile, "");
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"disassembling extract failed", &ProcRes);
-    }
-
-
-    let mut ProcRes = compile_cc_with_clang_and_save_bitcode(config, props, testfile);
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"compilation failed!", &ProcRes);
-    }
-
-    ProcRes = extract_function_from_bitcode(config, props, "test", testfile, "clang");
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"extracting 'test' function failed", &ProcRes);
-    }
-
-    ProcRes = disassemble_extract(config, props, testfile, "clang");
-    if ProcRes.status != 0 {
-        fatal_ProcRes(~"disassembling extract failed", &ProcRes);
-    }
-
-
-
-}
-

branches/try2/src/etc/vim/ftplugin/rust.vim

@@ -1,25 +1,14 @@
 " Vim syntax file
 " Language:     Rust
 " Maintainer:   Chris Morgan <[email protected]>
-" Last Change:  2013 Jul 10
+" Last Change:  2013 Jul 6
 
 if exists("b:did_ftplugin")
 	finish
 endif
 let b:did_ftplugin = 1
 
-" The rust source code at present seems to typically omit a leader on /*!
-" comments, so we'll use that as our default, but make it easy to switch.
-" This does not affect indentation at all (I tested it with and without
-" leader), merely whether a leader is inserted by default or not.
-if exists("g:rust_bang_comment_leader") && g:rust_bang_comment_leader == 1
-	" Why is the `,s0:/*,mb:\ ,ex:*/` there, you ask? I don't understand why,
-	" but without it, */ gets indented one space even if there were no
-	" leaders. I'm fairly sure that's a Vim bug.
-	setlocal comments=s1:/*,mb:*,ex:*/,s0:/*,mb:\ ,ex:*/,:///,://!,://
-else
-	setlocal comments=s0:/*!,m:\ ,ex:*/,s1:/*,mb:*,ex:*/,:///,://!,://
-endif
+setlocal comments=s1:/*,mb:*,ex:*/,:///,://!,://
 setlocal commentstring=//%s
 setlocal formatoptions-=t formatoptions+=croqnlj