From 8920ea6ae399c651ccd51239d7fb7358d9d44f97 Mon Sep 17 00:00:00 2001
From: Brad Anderson <brad@cloudant.com>
Date: Thu, 19 Aug 2010 14:19:14 -0400
Subject: etap couch tests now executing again, work to do on C libs to get
 them to pass

---
 .rebar/templates/Makefile             |  2 +-
 apps/couch/src/test_util.erl          | 35 +++++++++++++++++++++++++++++++++++
 apps/couch/test/etap/test_util.erl.in | 35 -----------------------------------
 3 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 apps/couch/src/test_util.erl
 delete mode 100644 apps/couch/test/etap/test_util.erl.in

diff --git a/.rebar/templates/Makefile b/.rebar/templates/Makefile
index 4bb6a814..bdc5625d 100644
--- a/.rebar/templates/Makefile
+++ b/.rebar/templates/Makefile
@@ -8,7 +8,7 @@ clean:
 
 check: compile
 	@ERL_LIBS="`pwd`/apps" ./rebar eunit
-	@ERL_LIBS="`pwd`/apps" prove apps/couch/test/*.t
+	@ERL_LIBS="`pwd`/apps" prove apps/couch/test/etap/*.t
 
 compilenative:
 	@./rebar compile erl_opts=native
diff --git a/apps/couch/src/test_util.erl b/apps/couch/src/test_util.erl
new file mode 100644
index 00000000..4c42edb1
--- /dev/null
+++ b/apps/couch/src/test_util.erl
@@ -0,0 +1,35 @@
+% 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.
+
+-module(test_util).
+
+-export([init_code_path/0]).
+-export([source_file/1, build_file/1]).
+
+srcdir() ->
+    "@abs_top_srcdir@".
+
+builddir() ->
+    "@abs_top_builddir@".
+
+init_code_path() ->
+    Paths = ["etap", "couchdb", "erlang-oauth", "ibrowse", "mochiweb"],
+    lists:foreach(fun(Name) ->
+        code:add_pathz(filename:join([builddir(), "src", Name]))
+    end, Paths).
+
+source_file(Name) ->
+    filename:join([srcdir(), Name]).
+
+build_file(Name) ->
+    filename:join([builddir(), Name]).
+
diff --git a/apps/couch/test/etap/test_util.erl.in b/apps/couch/test/etap/test_util.erl.in
deleted file mode 100644
index 4c42edb1..00000000
--- a/apps/couch/test/etap/test_util.erl.in
+++ /dev/null
@@ -1,35 +0,0 @@
-% 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.
-
--module(test_util).
-
--export([init_code_path/0]).
--export([source_file/1, build_file/1]).
-
-srcdir() ->
-    "@abs_top_srcdir@".
-
-builddir() ->
-    "@abs_top_builddir@".
-
-init_code_path() ->
-    Paths = ["etap", "couchdb", "erlang-oauth", "ibrowse", "mochiweb"],
-    lists:foreach(fun(Name) ->
-        code:add_pathz(filename:join([builddir(), "src", Name]))
-    end, Paths).
-
-source_file(Name) ->
-    filename:join([srcdir(), Name]).
-
-build_file(Name) ->
-    filename:join([builddir(), Name]).
-
-- 
cgit v1.2.3