From 6408a42c7adb40c8b25ff7dd5aa8953e9bec8e7a Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Mon, 19 Jun 2017 19:58:39 +0200
Subject: [PATCH] Move tests to the default `tests` directory

Instead of specifying a custom test directory, use the default
Rust way of doing things (which is having a `tests` directory.
---
 Cargo.toml                              |  4 ----
 test/test.rs                            | 22 ----------------------
 {test => tests}/test_column_family.rs   |  1 +
 {test => tests}/test_iterator.rs        |  1 +
 {test => tests}/test_multithreaded.rs   |  1 +
 {test => tests}/test_raw_iterator.rs    |  1 +
 {test => tests}/test_rocksdb_options.rs |  1 +
 7 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 test/test.rs
 rename {test => tests}/test_column_family.rs (99%)
 rename {test => tests}/test_iterator.rs (99%)
 rename {test => tests}/test_multithreaded.rs (98%)
 rename {test => tests}/test_raw_iterator.rs (99%)
 rename {test => tests}/test_rocksdb_options.rs (97%)

diff --git a/Cargo.toml b/Cargo.toml
index 5d91b0f..a0c1a11 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,10 +17,6 @@ exclude = [
 default = []
 valgrind = []
 
-[[test]]
-name = "test"
-path = "test/test.rs"
-
 [dependencies]
 libc = "0.2"
 librocksdb-sys = { path = "librocksdb-sys", version = "0.4.1" }
diff --git a/test/test.rs b/test/test.rs
deleted file mode 100644
index c1a6f0e..0000000
--- a/test/test.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2014 Tyler Neely
-//
-// 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.
-//
-
-extern crate rocksdb;
-
-mod test_iterator;
-mod test_raw_iterator;
-mod test_multithreaded;
-mod test_column_family;
-mod test_rocksdb_options;
diff --git a/test/test_column_family.rs b/tests/test_column_family.rs
similarity index 99%
rename from test/test_column_family.rs
rename to tests/test_column_family.rs
index 03b11fc..8644aaa 100644
--- a/test/test_column_family.rs
+++ b/tests/test_column_family.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+extern crate rocksdb;
 
 use rocksdb::{DB, MergeOperands, Options};
 
diff --git a/test/test_iterator.rs b/tests/test_iterator.rs
similarity index 99%
rename from test/test_iterator.rs
rename to tests/test_iterator.rs
index b3c1293..4b8a5b2 100644
--- a/test/test_iterator.rs
+++ b/tests/test_iterator.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+extern crate rocksdb;
 
 use rocksdb::{DB, Direction, IteratorMode, Options};
 
diff --git a/test/test_multithreaded.rs b/tests/test_multithreaded.rs
similarity index 98%
rename from test/test_multithreaded.rs
rename to tests/test_multithreaded.rs
index 83a1c49..30ef752 100644
--- a/test/test_multithreaded.rs
+++ b/tests/test_multithreaded.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+extern crate rocksdb;
 
 use rocksdb::{DB, Options};
 use std::thread;
diff --git a/test/test_raw_iterator.rs b/tests/test_raw_iterator.rs
similarity index 99%
rename from test/test_raw_iterator.rs
rename to tests/test_raw_iterator.rs
index 2c57280..7d99859 100644
--- a/test/test_raw_iterator.rs
+++ b/tests/test_raw_iterator.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+extern crate rocksdb;
 
 use rocksdb::DB;
 
diff --git a/test/test_rocksdb_options.rs b/tests/test_rocksdb_options.rs
similarity index 97%
rename from test/test_rocksdb_options.rs
rename to tests/test_rocksdb_options.rs
index 0517a72..12c9555 100644
--- a/test/test_rocksdb_options.rs
+++ b/tests/test_rocksdb_options.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+extern crate rocksdb;
 
 use rocksdb::{DB, Options};