From a870963e37cc1a83aa7bc1fc1ef2ee929ee8ab44 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 19 Sep 2017 10:50:43 -0700 Subject: [PATCH] Fix tests from rename --- {gcc-test => cc-test}/Cargo.toml | 9 ++++----- {gcc-test => cc-test}/build.rs | 20 ++++++++++---------- {gcc-test => cc-test}/src/NMakefile | 0 {gcc-test => cc-test}/src/bar1.c | 0 {gcc-test => cc-test}/src/bar2.c | 0 {gcc-test => cc-test}/src/baz.cpp | 0 {gcc-test => cc-test}/src/expand.c | 0 {gcc-test => cc-test}/src/foo.c | 0 {gcc-test => cc-test}/src/i686.S | 0 {gcc-test => cc-test}/src/i686.asm | 0 {gcc-test => cc-test}/src/include/foo.h | 0 {gcc-test => cc-test}/src/lib.rs | 0 {gcc-test => cc-test}/src/msvc.c | 0 {gcc-test => cc-test}/src/opt_linkage.c | 0 {gcc-test => cc-test}/src/windows.c | 0 {gcc-test => cc-test}/src/x86_64.S | 0 {gcc-test => cc-test}/src/x86_64.asm | 0 {gcc-test => cc-test}/tests/all.rs | 4 ++-- tests/cc_env.rs | 2 +- tests/support/mod.rs | 6 +++--- tests/test.rs | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) rename {gcc-test => cc-test}/Cargo.toml (58%) rename {gcc-test => cc-test}/build.rs (88%) rename {gcc-test => cc-test}/src/NMakefile (100%) rename {gcc-test => cc-test}/src/bar1.c (100%) rename {gcc-test => cc-test}/src/bar2.c (100%) rename {gcc-test => cc-test}/src/baz.cpp (100%) rename {gcc-test => cc-test}/src/expand.c (100%) rename {gcc-test => cc-test}/src/foo.c (100%) rename {gcc-test => cc-test}/src/i686.S (100%) rename {gcc-test => cc-test}/src/i686.asm (100%) rename {gcc-test => cc-test}/src/include/foo.h (100%) rename {gcc-test => cc-test}/src/lib.rs (100%) rename {gcc-test => cc-test}/src/msvc.c (100%) rename {gcc-test => cc-test}/src/opt_linkage.c (100%) rename {gcc-test => cc-test}/src/windows.c (100%) rename {gcc-test => cc-test}/src/x86_64.S (100%) rename {gcc-test => cc-test}/src/x86_64.asm (100%) rename {gcc-test => cc-test}/tests/all.rs (94%) diff --git a/gcc-test/Cargo.toml b/cc-test/Cargo.toml similarity index 58% rename from gcc-test/Cargo.toml rename to cc-test/Cargo.toml index ba40ec0..e83416a 100644 --- a/gcc-test/Cargo.toml +++ b/cc-test/Cargo.toml @@ -1,16 +1,15 @@ [package] -name = "gcc-test" +name = "cc-test" version = "0.1.0" authors = ["Alex Crichton "] -build = "build.rs" [lib] -name = "gcc_test" +name = "cc_test" doctest = false test = false [build-dependencies] -gcc = { path = ".." } +cc = { path = ".." } [features] -parallel = ["gcc/parallel"] +parallel = ["cc/parallel"] diff --git a/gcc-test/build.rs b/cc-test/build.rs similarity index 88% rename from gcc-test/build.rs rename to cc-test/build.rs index e6308ed..5a7b178 100644 --- a/gcc-test/build.rs +++ b/cc-test/build.rs @@ -1,4 +1,4 @@ -extern crate gcc; +extern crate cc; use std::env; use std::fs; @@ -9,7 +9,7 @@ fn main() { fs::remove_dir_all(&out).unwrap(); fs::create_dir(&out).unwrap(); - gcc::Build::new() + cc::Build::new() .file("src/foo.c") .flag_if_supported("-Wall") .flag_if_supported("-Wfoo-bar-this-flag-does-not-exist") @@ -17,7 +17,7 @@ fn main() { .define("BAR", "1") .compile("foo"); - gcc::Build::new() + cc::Build::new() .file("src/bar1.c") .file("src/bar2.c") .include("src/include") @@ -28,17 +28,17 @@ fn main() { let file = format!("src/{}.{}", file, if target.contains("msvc") { "asm" } else { "S" }); - gcc::Build::new() + cc::Build::new() .file(file) .compile("asm"); - gcc::Build::new() + cc::Build::new() .file("src/baz.cpp") .cpp(true) .compile("baz"); if target.contains("windows") { - gcc::Build::new() + cc::Build::new() .file("src/windows.c") .compile("windows"); } @@ -50,7 +50,7 @@ fn main() { let out = out.join("tmp"); fs::create_dir(&out).unwrap(); println!("nmake 1"); - let status = gcc::windows_registry::find(&target, "nmake.exe") + let status = cc::windows_registry::find(&target, "nmake.exe") .unwrap() .env_remove("MAKEFLAGS") .arg("/fsrc/NMakefile") @@ -67,7 +67,7 @@ fn main() { env::remove_var("INCLUDE"); env::remove_var("LIB"); println!("nmake 2"); - let status = gcc::windows_registry::find(&target, "nmake.exe") + let status = cc::windows_registry::find(&target, "nmake.exe") .unwrap() .env_remove("MAKEFLAGS") .arg("/fsrc/NMakefile") @@ -81,12 +81,12 @@ fn main() { // This tests whether we can build a library but not link it to the main // crate. The test module will do its own linking. - gcc::Build::new() + cc::Build::new() .cargo_metadata(false) .file("src/opt_linkage.c") .compile("OptLinkage"); - let out = gcc::Build::new() + let out = cc::Build::new() .file("src/expand.c") .expand(); let out = String::from_utf8(out).unwrap(); diff --git a/gcc-test/src/NMakefile b/cc-test/src/NMakefile similarity index 100% rename from gcc-test/src/NMakefile rename to cc-test/src/NMakefile diff --git a/gcc-test/src/bar1.c b/cc-test/src/bar1.c similarity index 100% rename from gcc-test/src/bar1.c rename to cc-test/src/bar1.c diff --git a/gcc-test/src/bar2.c b/cc-test/src/bar2.c similarity index 100% rename from gcc-test/src/bar2.c rename to cc-test/src/bar2.c diff --git a/gcc-test/src/baz.cpp b/cc-test/src/baz.cpp similarity index 100% rename from gcc-test/src/baz.cpp rename to cc-test/src/baz.cpp diff --git a/gcc-test/src/expand.c b/cc-test/src/expand.c similarity index 100% rename from gcc-test/src/expand.c rename to cc-test/src/expand.c diff --git a/gcc-test/src/foo.c b/cc-test/src/foo.c similarity index 100% rename from gcc-test/src/foo.c rename to cc-test/src/foo.c diff --git a/gcc-test/src/i686.S b/cc-test/src/i686.S similarity index 100% rename from gcc-test/src/i686.S rename to cc-test/src/i686.S diff --git a/gcc-test/src/i686.asm b/cc-test/src/i686.asm similarity index 100% rename from gcc-test/src/i686.asm rename to cc-test/src/i686.asm diff --git a/gcc-test/src/include/foo.h b/cc-test/src/include/foo.h similarity index 100% rename from gcc-test/src/include/foo.h rename to cc-test/src/include/foo.h diff --git a/gcc-test/src/lib.rs b/cc-test/src/lib.rs similarity index 100% rename from gcc-test/src/lib.rs rename to cc-test/src/lib.rs diff --git a/gcc-test/src/msvc.c b/cc-test/src/msvc.c similarity index 100% rename from gcc-test/src/msvc.c rename to cc-test/src/msvc.c diff --git a/gcc-test/src/opt_linkage.c b/cc-test/src/opt_linkage.c similarity index 100% rename from gcc-test/src/opt_linkage.c rename to cc-test/src/opt_linkage.c diff --git a/gcc-test/src/windows.c b/cc-test/src/windows.c similarity index 100% rename from gcc-test/src/windows.c rename to cc-test/src/windows.c diff --git a/gcc-test/src/x86_64.S b/cc-test/src/x86_64.S similarity index 100% rename from gcc-test/src/x86_64.S rename to cc-test/src/x86_64.S diff --git a/gcc-test/src/x86_64.asm b/cc-test/src/x86_64.asm similarity index 100% rename from gcc-test/src/x86_64.asm rename to cc-test/src/x86_64.asm diff --git a/gcc-test/tests/all.rs b/cc-test/tests/all.rs similarity index 94% rename from gcc-test/tests/all.rs rename to cc-test/tests/all.rs index 7b70f4e..59cb8e4 100644 --- a/gcc-test/tests/all.rs +++ b/cc-test/tests/all.rs @@ -1,6 +1,6 @@ -extern crate gcc_test; +extern crate cc_test; -use gcc_test::*; +use cc_test::*; #[link(name = "OptLinkage", kind = "static")] extern "C" { diff --git a/tests/cc_env.rs b/tests/cc_env.rs index 559dbe8..642200d 100644 --- a/tests/cc_env.rs +++ b/tests/cc_env.rs @@ -1,5 +1,5 @@ extern crate tempdir; -extern crate gcc; +extern crate cc; use std::env; diff --git a/tests/support/mod.rs b/tests/support/mod.rs index 2f3e44c..4288546 100644 --- a/tests/support/mod.rs +++ b/tests/support/mod.rs @@ -6,7 +6,7 @@ use std::fs::{self, File}; use std::io::prelude::*; use std::path::PathBuf; -use gcc; +use cc; use tempdir::TempDir; pub struct Test { @@ -55,8 +55,8 @@ impl Test { self } - pub fn gcc(&self) -> gcc::Build { - let mut cfg = gcc::Build::new(); + pub fn gcc(&self) -> cc::Build { + let mut cfg = cc::Build::new(); let mut path = env::split_paths(&env::var_os("PATH").unwrap()).collect::>(); path.insert(0, self.td.path().to_owned()); let target = if self.msvc { diff --git a/tests/test.rs b/tests/test.rs index dd60f94..b8f1abf 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -1,4 +1,4 @@ -extern crate gcc; +extern crate cc; extern crate tempdir; use support::Test;