Skip to content
This repository has been archived by the owner on Nov 18, 2020. It is now read-only.

Commit

Permalink
added pika to test dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
priviterag committed Aug 20, 2015
1 parent 4f1718f commit 72f3fde
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ erl_crash.dump
/tmp/
/deps/stomppy/stomppy/
/deps/stomppy/stomppy-git/
/deps/pika/pika/
/deps/pika/pika-git/
27 changes: 27 additions & 0 deletions deps/pika/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
UPSTREAM_GIT=https://github.com/pika/pika.git
REVISION=0.9.14

LIB_DIR=pika
CHECKOUT_DIR=pika-git

TARGETS=$(LIB_DIR)

all: $(TARGETS)

clean:
rm -rf $(LIB_DIR)

distclean: clean
rm -rf $(CHECKOUT_DIR)

$(LIB_DIR) : $(CHECKOUT_DIR)
rm -rf $@
cp -R $< $@

$(CHECKOUT_DIR):
git clone $(UPSTREAM_GIT) $@
(cd $@ && git checkout $(REVISION)) || rm -rf $@

echo-revision:
@echo $(REVISION)

2 changes: 2 additions & 0 deletions package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ $(PACKAGE_DIR)+pre-test::
sed -e "s|%%CERTS_DIR%%|$(abspath $(PACKAGE_DIR))/test/certs|g" < $(PACKAGE_DIR)/test/src/test.config > $(PACKAGE_DIR)/test/ebin/test.config
$(MAKE) -C $(PACKAGE_DIR)/../rabbitmq-test/certs all PASSWORD=test DIR=$(abspath $(PACKAGE_DIR))/test/certs
$(MAKE) -C $(PACKAGE_DIR)/deps/stomppy
$(MAKE) -C $(PACKAGE_DIR)/deps/pika

$(PACKAGE_DIR)+clean::
rm -rf $(PACKAGE_DIR)/test/certs

$(PACKAGE_DIR)+clean-with-deps::
$(MAKE) -C $(PACKAGE_DIR)/deps/stomppy distclean
$(MAKE) -C $(PACKAGE_DIR)/deps/pika distclean

endef
1 change: 1 addition & 0 deletions test/src/test_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
def add_deps_to_path():
deps_dir = os.path.realpath(os.path.join(__file__, "..", "..", "..", "deps"))
sys.path.append(os.path.join(deps_dir, "stomppy", "stomppy"))
sys.path.append(os.path.join(deps_dir, "pika", "pika"))

def run_unittests(modules):
add_deps_to_path()
Expand Down

0 comments on commit 72f3fde

Please sign in to comment.