From 0ab2c7f5312317ab9cb8208c5410b7e3ca6c75bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Crozet?= <developer@crozet.re>
Date: Sat, 7 May 2016 22:44:30 +0200
Subject: [PATCH] Move examples using the testbed to the testbed's example
 folders.

Fix #132.
---
 .travis.yml                                                | 5 +++++
 Cargo.toml                                                 | 2 --
 ncollide_testbed2d/Cargo.toml                              | 7 ++-----
 ncollide_testbed2d/Makefile                                | 3 +++
 .../examples}/bouncing_ball2d.rs                           | 0
 ncollide_testbed3d/Cargo.toml                              | 7 ++-----
 ncollide_testbed3d/Makefile                                | 3 +++
 .../examples}/bouncing_ball3d.rs                           | 0
 8 files changed, 15 insertions(+), 12 deletions(-)
 rename {examples => ncollide_testbed2d/examples}/bouncing_ball2d.rs (100%)
 rename {examples => ncollide_testbed3d/examples}/bouncing_ball3d.rs (100%)

diff --git a/.travis.yml b/.travis.yml
index cedc7efb6..de69f2011 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,3 +34,8 @@ script:
   - cd $TRAVIS_BUILD_DIR
   - make all
   - make test
+  - cd ncollide_testbed2d
+  - make test
+  - cd $TRAVIS_BUILD_DIR
+  - cd ncollide_testbed3d
+  - make test
diff --git a/Cargo.toml b/Cargo.toml
index 7362acce3..653b2658e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,5 +34,3 @@ ncollide_transformation = { path = "ncollide_transformation", version = "0.4.*"
 [dev-dependencies]
 nalgebra = "0.8.*"
 rand = "0.3.*"
-ncollide_testbed2d = { path = "ncollide_testbed2d", version = "0.1.*" }
-ncollide_testbed3d = { path = "ncollide_testbed3d", version = "0.1.*" }
diff --git a/ncollide_testbed2d/Cargo.toml b/ncollide_testbed2d/Cargo.toml
index 137a27993..da248ae9a 100644
--- a/ncollide_testbed2d/Cargo.toml
+++ b/ncollide_testbed2d/Cargo.toml
@@ -16,14 +16,11 @@ name = "ncollide_testbed2d"
 default = [ ]
 recording = [ "mpeg_encoder" ]
 
-[dependencies.ncollide]
-path = ".."
-version = "0.9.0"
-
 [dependencies]
-nalgebra = "0.8.*"
 time = "0.1.*"
 num = "0.1.*"
 rand = "0.3.*"
 mpeg_encoder = { version = "0.2.*", optional = true }
 sfml = "0.11.*"
+nalgebra = "0.8.*"
+ncollide = "0.9.*"
diff --git a/ncollide_testbed2d/Makefile b/ncollide_testbed2d/Makefile
index ab8a74a0c..77e84a0cf 100644
--- a/ncollide_testbed2d/Makefile
+++ b/ncollide_testbed2d/Makefile
@@ -1,2 +1,5 @@
 all:
 	cargo build
+
+test:
+	cargo test
diff --git a/examples/bouncing_ball2d.rs b/ncollide_testbed2d/examples/bouncing_ball2d.rs
similarity index 100%
rename from examples/bouncing_ball2d.rs
rename to ncollide_testbed2d/examples/bouncing_ball2d.rs
diff --git a/ncollide_testbed3d/Cargo.toml b/ncollide_testbed3d/Cargo.toml
index a7c1d5b5a..fca356c9c 100644
--- a/ncollide_testbed3d/Cargo.toml
+++ b/ncollide_testbed3d/Cargo.toml
@@ -17,13 +17,10 @@ default = [ ]
 recording = [ "mpeg_encoder" ]
 
 [dependencies]
-nalgebra = "0.8.*"
 time = "0.1.*"
 rand = "0.3.*"
 glfw = "0.2.*"
 kiss3d = "0.4.*"
 mpeg_encoder = { version = "0.2.*", optional = true }
-
-[dependencies.ncollide]
-path = ".."
-version = "0.9.0"
+nalgebra = "0.8.*"
+ncollide = "0.9.*"
diff --git a/ncollide_testbed3d/Makefile b/ncollide_testbed3d/Makefile
index ab8a74a0c..77e84a0cf 100644
--- a/ncollide_testbed3d/Makefile
+++ b/ncollide_testbed3d/Makefile
@@ -1,2 +1,5 @@
 all:
 	cargo build
+
+test:
+	cargo test
diff --git a/examples/bouncing_ball3d.rs b/ncollide_testbed3d/examples/bouncing_ball3d.rs
similarity index 100%
rename from examples/bouncing_ball3d.rs
rename to ncollide_testbed3d/examples/bouncing_ball3d.rs