Fix tests from rename

gcc-test/Cargo.toml → cc-test/Cargo.toml

@@ -1,16 +1,15 @@
 [package]
-name = "gcc-test"
+name = "cc-test"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
-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"]

gcc-test/build.rs → 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();

gcc-test/tests/all.rs → 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" {

tests/cc_env.rs

@@ -1,5 +1,5 @@
 extern crate tempdir;
-extern crate gcc;
+extern crate cc;
 
 use std::env;
 

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 {
+    pub fn gcc(&self) -> cc::Build {
-        let mut cfg = gcc::Build::new();
+        let mut cfg = cc::Build::new();
         let mut path = env::split_paths(&env::var_os("PATH").unwrap()).collect::<Vec<_>>();
         path.insert(0, self.td.path().to_owned());
         let target = if self.msvc {

tests/test.rs

@@ -1,4 +1,4 @@
-extern crate gcc;
+extern crate cc;
 extern crate tempdir;
 
 use support::Test;