updating rabbit_common.app; other minor

rabbitmq · Jan 27, 2011 · 026250f · 026250f
1 parent 6f7e1e9
commit 026250f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/common.mk b/common.mk
@@ -63,7 +63,7 @@ export COMMON_PACKAGE_DIR=$(COMMON_PACKAGE)$(if $(APPEND_VERSION),-$(VERSION),)
 COMMON_PACKAGE_EZ=$(COMMON_PACKAGE_DIR).ez
 
 DEPS=$(shell erl -noshell -eval '{ok,[{_,_,[_,_,{modules, Mods},_,_,_]}]} = \
-                                 file:consult("$(COMMON_PACKAGE).app"), \
+                                 file:consult("$(COMMON_PACKAGE).app.in"), \
                                  [io:format("~p ",[M]) || M <- Mods], halt().')
 
 INCLUDES=$(wildcard $(INCLUDE_DIR)/*.hrl)

diff --git a/rabbit_common.app.in b/rabbit_common.app.in
@@ -3,6 +3,7 @@
   {vsn, "%%VSN%%"},
   {modules, [
              gen_server2,
+             delegate,
              priority_queue,
              rabbit_backing_queue,
              rabbit_basic,
@@ -22,6 +23,7 @@
              rabbit_reader,
              rabbit_writer,
              rabbit_queue_collector,
+             rabbit_amqqueue,
              supervisor2
   ]},
   {registered, []},

diff --git a/test.mk b/test.mk
@@ -95,7 +95,7 @@ test_direct: prepare_tests
 	$(MAKE) run_test_in_broker RUN_TEST_ARGS="-s direct_client_SUITE test"
 
 test_remote_direct: prepare_tests
-	$(MAKE) run_test_in_broker RUN_TEST_ARGS="-s direct_client_SUITE test"
+	$(MAKE) run_test_detached RUN_TEST_ARGS="-s direct_client_SUITE test"
 
 test_common_package: $(DIST_DIR)/$(COMMON_PACKAGE_EZ) package prepare_tests
 	$(MAKE) run_test_detached RUN="$(LIBS_PATH) erl -pa $(TEST_DIR)" \
@@ -111,3 +111,6 @@ test_network_coverage: prepare_tests
 
 test_direct_coverage: prepare_tests
 	$(MAKE) run_test_in_broker RUN_TEST_ARGS="-s direct_client_SUITE test_coverage"
+
+test_direct_remote_coverage: prepare_tests
+	$(MAKE) run_test_detached RUN_TEST_ARGS="-s direct_client_SUITE test_coverage"