From c540835cf3dde2a91e582879fd6997b41b5c9cf0 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 23 Mar 2016 13:14:17 +0100 Subject: [PATCH] python: avoid long paths (part 2) make CEPH_BUILD_VIRTUALENV=/tmp TESTS=ceph-detect-init/run-tox.sh check sets the CEPH_DETECT_INIT_VIRTUALENV environment variable CEPH_BUILD_VIRTUALENV=/tmp make TESTS=ceph-detect-init/run-tox.sh check does not because Makefile-env.am overrides it. Do not set CEPH_BUILD_VIRTUALENV in Makefile-env.am so the variable from the environment can be used. Require that CEPH_BUILD_VIRTUALENV has a trailing slash so that the default is just an empty variable. Signed-off-by: Loic Dachary --- src/Makefile-env.am | 2 -- src/ceph-detect-init/Makefile.am | 2 +- src/ceph-disk/Makefile.am | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile-env.am b/src/Makefile-env.am index cb77d9da4a4a..cf5a69298b36 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -299,5 +299,3 @@ DENCODER_DEPS = radoslibdir = $(libdir)/rados-classes - -CEPH_BUILD_VIRTUALENV = . diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am index 8ddcb1eaeae0..0d199e741daa 100644 --- a/src/ceph-detect-init/Makefile.am +++ b/src/ceph-detect-init/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST += \ ceph-detect-init/tests/test_all.py \ ceph-detect-init/tox.ini -export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv +export CEPH_DETECT_INIT_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}ceph-detect-init-virtualenv ceph-detect-init-all: ${CEPH_DETECT_INIT_VIRTUALENV} diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am index 900630382a13..952a486566c2 100644 --- a/src/ceph-disk/Makefile.am +++ b/src/ceph-disk/Makefile.am @@ -29,7 +29,7 @@ EXTRA_DIST += \ ceph-disk/tests/test_main.py \ ceph-disk/tox.ini -export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv +export CEPH_DISK_VIRTUALENV = ${CEPH_BUILD_VIRTUALENV}ceph-disk-virtualenv ceph-disk-all: ${CEPH_DISK_VIRTUALENV} -- 2.47.3