Fix CI

.gitignore

@@ -1,2 +1,2 @@
-/target
+target
-/Cargo.lock
+Cargo.lock

.travis.yml

@@ -32,3 +32,7 @@ notifications:
 os:
   - linux
   - osx
+addons:
+  apt:
+    packages:
+      - gcc-multilib

gcc-test/Cargo.lock

@@ -1,11 +0,0 @@
-[root]
-name = "gcc-test"
-version = "0.1.0"
-dependencies = [
- "gcc 0.3.8",
-]
-
-[[package]]
-name = "gcc"
-version = "0.3.8"
-

gcc-test/Cargo.toml

@@ -5,8 +5,9 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"]
 build = "build.rs"
 
 [lib]
-name = "gcc-test"
+name = "gcc_test"
 doctest = false
+test = false
 
 [build-dependencies]
 gcc = { path = ".." }

gcc-test/src/lib.rs

@@ -6,18 +6,3 @@ extern {
     pub fn bar1() -> i32;
     pub fn bar2() -> i32;
 }
-
-#[test]
-fn foo_here() {
-    unsafe {
-        assert_eq!(foo(), 4);
-    }
-}
-
-#[test]
-fn bar_here() {
-    unsafe {
-        assert_eq!(bar1(), 5);
-        assert_eq!(bar2(), 6);
-    }
-}

gcc-test/tests/all.rs

@@ -0,0 +1,19 @@
+extern crate gcc_test;
+
+use gcc_test::*;
+
+#[test]
+fn foo_here() {
+    unsafe {
+        assert_eq!(foo(), 4);
+    }
+}
+
+#[test]
+fn bar_here() {
+    unsafe {
+        assert_eq!(bar1(), 5);
+        assert_eq!(bar2(), 6);
+    }
+}
+