From 435aed29315cef73a9df9bf35a7fb6bbef6f9559 Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <adam@cloudant.com>
Date: Wed, 9 Feb 2011 11:01:54 -0500
Subject: [PATCH] Fix and simplify environment for etap tests

BugzID: 11797
---
 Makefile                     |  6 +++---
 apps/couch/src/test_util.erl | 15 +++------------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 159b5874..4bf74e8c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ clean:
 	@cd couchjs && python scons/scons.py --clean
 	@./rebar clean
 
-check:
+# compile is required here because of cross-dependencies between apps
+check: compile
 	@./rebar eunit
-	@ERL_FLAGS="-pa `pwd`/apps/couch/ebin `pwd`/apps/couch/test/etap" \
-		prove apps/couch/test/etap/*.t
+	@ERL_FLAGS="-pa `pwd`/apps/couch/ebin" prove apps/couch/test/etap/*.t
 
 dist: compile
 	@rm -rf rel/bigcouch
diff --git a/apps/couch/src/test_util.erl b/apps/couch/src/test_util.erl
index ce6a20ef..e43338e7 100644
--- a/apps/couch/src/test_util.erl
+++ b/apps/couch/src/test_util.erl
@@ -15,20 +15,11 @@
 -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", "couch", "oauth", "ibrowse", "mochiweb"],
-    lists:foreach(fun(Name) ->
-        code:add_pathz(filename:join([builddir(), "ebin", Name]))
-    end, Paths).
+    code:load_abs("apps/couch/test/etap/etap").
 
 source_file(Name) ->
-    filename:join([srcdir(), Name]).
+    filename:join(["apps/couch", Name]).
 
 build_file(Name) ->
-    filename:join([builddir(), Name]).
+    filename:join(["apps/couch", Name]).