Skip to content

Commit

Permalink
Warning police.
Browse files Browse the repository at this point in the history
  • Loading branch information
metajack committed Jan 17, 2014
1 parent f7088ed commit 7fb712e
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions src/librustpkg/tests.rs
Expand Up @@ -26,7 +26,7 @@ use extra::getopts::groups::getopts;
use std::run::ProcessOutput;
use installed_packages::list_installed_packages;
use crate_id::{CrateId};
use version::{ExactRevision, NoVersion, Version, Tagged};
use version::{ExactRevision, NoVersion, Version};
use path_util::{target_executable_in_workspace, target_test_in_workspace,
target_bench_in_workspace, make_dir_rwx,
library_in_workspace, installed_library_in_workspace,
Expand All @@ -35,7 +35,6 @@ use path_util::{target_executable_in_workspace, target_test_in_workspace,
chmod_read_only, platform_library_name};
use rustc::back::link::get_cc_prog;
use rustc::metadata::filesearch::{rust_path, libdir, rustlibdir};
use rustc::driver::session;
use rustc::driver::driver::{build_session, build_session_options, host_triple, optgroups};
use syntax::diagnostic;
use target::*;
Expand Down Expand Up @@ -76,14 +75,6 @@ fn git_repo_pkg() -> CrateId {
}
}

fn git_repo_pkg_with_tag(a_tag: ~str) -> CrateId {
CrateId {
path: Path::new("mockgithub.com/catamorphism/test-pkg"),
short_name: ~"test-pkg",
version: Tagged(a_tag)
}
}

fn writeFile(file_path: &Path, contents: &str) {
let mut out = File::create(file_path);
out.write(contents.as_bytes());
Expand Down Expand Up @@ -487,12 +478,6 @@ fn lib_output_file_name(workspace: &Path, short_name: &str) -> Path {
&NoVersion).expect("lib_output_file_name")
}

fn output_file_name(workspace: &Path, short_name: ~str) -> Path {
target_build_dir(workspace).join(short_name.as_slice())
.join(format!("{}{}", short_name,
os::consts::EXE_SUFFIX))
}

#[cfg(target_os = "linux")]
fn touch_source_file(workspace: &Path, crateid: &CrateId) {
use conditions::bad_path::cond;
Expand Down

17 comments on commit 7fb712e

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at metajack@7fb712e

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging metajack/rust/rustpkg-new-crateid-syntax = 7fb712e into auto

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 17, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

metajack/rust/rustpkg-new-crateid-syntax = 7fb712e merged ok, testing candidate = 82c6dac4

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at metajack@7fb712e

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging metajack/rust/rustpkg-new-crateid-syntax = 7fb712e into auto

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

metajack/rust/rustpkg-new-crateid-syntax = 7fb712e merged ok, testing candidate = 78d58f27

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at metajack@7fb712e

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging metajack/rust/rustpkg-new-crateid-syntax = 7fb712e into auto

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

metajack/rust/rustpkg-new-crateid-syntax = 7fb712e merged ok, testing candidate = 5ba25236

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from cmr
at metajack@7fb712e

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging metajack/rust/rustpkg-new-crateid-syntax = 7fb712e into auto

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

metajack/rust/rustpkg-new-crateid-syntax = 7fb712e merged ok, testing candidate = 0f8c29f

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 7fb712e Jan 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 0f8c29f

Please sign in to comment.