From 549aea642704335c9b1cf9e464130fa8a1b7d330 Mon Sep 17 00:00:00 2001
From: Eduard Bopp <eduard.bopp@aepsil0n.de>
Date: Thu, 23 Oct 2014 11:15:27 +0200
Subject: [PATCH] Use Cargo to run the benchmarks

Naming the benchmark folder benches instead of bench lets Cargo run the
benchmarks one by one like the test suite. The directory structure was modified
accordingly also getting rid of the now superfluous files.
---
 bench/Makefile               | 11 ----------
 bench/bench.rs               | 39 ------------------------------------
 {bench => benches}/matrix.rs |  5 +++++
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 bench/Makefile
 delete mode 100644 bench/bench.rs
 rename {bench => benches}/matrix.rs (99%)

diff --git a/bench/Makefile b/bench/Makefile
deleted file mode 100644
index 5ea2303..0000000
--- a/bench/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-all: bench
-
-bench: *.rs ../src/*.rs
-	(cd .. && cargo build)
-	rustc -L ../target --test bench.rs
-
-run: bench
-	./bench --bench
-
-clean:
-	rm bench
diff --git a/bench/bench.rs b/bench/bench.rs
deleted file mode 100644
index 2603bf2..0000000
--- a/bench/bench.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The CGMath Developers. For a full listing of the authors,
-// refer to the AUTHORS file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#![feature(globs)]
-
-extern crate cgmath;
-extern crate test;
-
-// pub mod array;
-pub mod matrix;
-// pub mod quaternion;
-//pub mod vector;
-
-//pub mod angle;
-//pub mod plane;
-//pub mod point;
-// pub mod ray;
-// pub mod rotation;
-//pub mod transform;
-
-// pub mod projection;
-
-// pub mod aabb;
-// pub mod cylinder;
-// pub mod frustum;
-// pub mod intersect;
-// pub mod obb;
-//pub mod sphere;
diff --git a/bench/matrix.rs b/benches/matrix.rs
similarity index 99%
rename from bench/matrix.rs
rename to benches/matrix.rs
index f167a12..f1f7589 100644
--- a/bench/matrix.rs
+++ b/benches/matrix.rs
@@ -13,6 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![feature(globs)]
+
+extern crate cgmath;
+extern crate test;
+
 use cgmath::*;
 
 use test::Bencher;