You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/12/10 20:59:31 UTC
git commit: Fixed the python tests in the presence of muliple eggs.
Updated Branches:
refs/heads/master 4f99d86fe -> 969e7a49a
Fixed the python tests in the presence of muliple eggs.
Review: https://reviews.apache.org/r/16136
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/969e7a49
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/969e7a49
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/969e7a49
Branch: refs/heads/master
Commit: 969e7a49a86d88034ab22ea9994747935e055c0f
Parents: 4f99d86
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 9 13:48:02 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Dec 10 11:39:03 2013 -0800
----------------------------------------------------------------------
src/examples/python/test-executor.in | 10 +++++++---
src/examples/python/test-framework.in | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/969e7a49/src/examples/python/test-executor.in
----------------------------------------------------------------------
diff --git a/src/examples/python/test-executor.in b/src/examples/python/test-executor.in
index 6f18682..e1179ba 100644
--- a/src/examples/python/test-executor.in
+++ b/src/examples/python/test-executor.in
@@ -14,20 +14,24 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE_EGG=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/dist/*.egg`
+DISTRIBUTE_EGG=${MESOS_BUILD_DIR}/3rdparty/distribute-0.6.26/dist/
+DISTRIBUTE_EGG+=distribute-0.6.26@PYTHON_EGG_PUREPY_POSTFIX@.egg
test ! -e ${DISTRIBUTE_EGG} && \
echo "${RED}Failed to find ${DISTRIBUTE_EGG}${NORMAL}" && \
exit 1
PROTOBUF=${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-2.4.1
-PROTOBUF_EGG=`echo ${PROTOBUF}/python/dist/protobuf*.egg`
+
+PROTOBUF_EGG=${PROTOBUF}/python/dist/
+PROTOBUF_EGG+=protobuf-2.4.1@PYTHON_EGG_PUREPY_POSTFIX@.egg
test ! -e ${PROTOBUF_EGG} && \
echo "${RED}Failed to find ${PROTOBUF_EGG}${NORMAL}" && \
exit 1
-MESOS_EGG=`echo ${MESOS_BUILD_DIR}/src/python/dist/mesos*.egg`
+MESOS_EGG=${MESOS_BUILD_DIR}/src/python/dist/
+MESOS_EGG+=mesos-@PACKAGE_VERSION@@PYTHON_EGG_POSTFIX@.egg
test ! -e ${MESOS_EGG} && \
echo "${RED}Failed to find ${MESOS_EGG}${NORMAL}" && \
http://git-wip-us.apache.org/repos/asf/mesos/blob/969e7a49/src/examples/python/test-framework.in
----------------------------------------------------------------------
diff --git a/src/examples/python/test-framework.in b/src/examples/python/test-framework.in
index d66cf6b..6c78531 100644
--- a/src/examples/python/test-framework.in
+++ b/src/examples/python/test-framework.in
@@ -14,20 +14,24 @@ test ! -z "${PYTHON}" && \
PYTHON=@PYTHON@
-DISTRIBUTE_EGG=`echo ${MESOS_BUILD_DIR}/3rdparty/distribute-*/dist/*.egg`
+DISTRIBUTE_EGG=${MESOS_BUILD_DIR}/3rdparty/distribute-0.6.26/dist/
+DISTRIBUTE_EGG+=distribute-0.6.26@PYTHON_EGG_PUREPY_POSTFIX@.egg
test ! -e ${DISTRIBUTE_EGG} && \
echo "${RED}Failed to find ${DISTRIBUTE_EGG}${NORMAL}" && \
exit 1
PROTOBUF=${MESOS_BUILD_DIR}/3rdparty/libprocess/3rdparty/protobuf-2.4.1
-PROTOBUF_EGG=`echo ${PROTOBUF}/python/dist/protobuf*.egg`
+
+PROTOBUF_EGG=${PROTOBUF}/python/dist/
+PROTOBUF_EGG+=protobuf-2.4.1@PYTHON_EGG_PUREPY_POSTFIX@.egg
test ! -e ${PROTOBUF_EGG} && \
echo "${RED}Failed to find ${PROTOBUF_EGG}${NORMAL}" && \
exit 1
-MESOS_EGG=`echo ${MESOS_BUILD_DIR}/src/python/dist/mesos*.egg`
+MESOS_EGG=${MESOS_BUILD_DIR}/src/python/dist/
+MESOS_EGG+=mesos-@PACKAGE_VERSION@@PYTHON_EGG_POSTFIX@.egg
test ! -e ${MESOS_EGG} && \
echo "${RED}Failed to find ${MESOS_EGG}${NORMAL}" && \