diff options
| -rw-r--r-- | generated_tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | generated_tests/templates/__init__.py | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/generated_tests/CMakeLists.txt b/generated_tests/CMakeLists.txt index dcee62a3a..d0b145aab 100644 --- a/generated_tests/CMakeLists.txt +++ b/generated_tests/CMakeLists.txt @@ -13,7 +13,7 @@ function(piglit_make_generated_tests file_list generator_script) # during the build. add_custom_command( OUTPUT ${file_list} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${generator_script} > ${file_list} + COMMAND ${CMAKE_COMMAND} -E env PIGLIT_BUILD_TREE=${CMAKE_BINARY_DIR} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${generator_script} > ${file_list} DEPENDS ${generator_script} ${ARGN} VERBATIM) endfunction(piglit_make_generated_tests custom_target generator_script) diff --git a/generated_tests/templates/__init__.py b/generated_tests/templates/__init__.py index 240004bfd..a218c8c13 100644 --- a/generated_tests/templates/__init__.py +++ b/generated_tests/templates/__init__.py @@ -32,13 +32,18 @@ from mako.template import Template from mako.lookup import TemplateLookup -# Based on a similar setup in framework/summary -MAKO_TEMP_DIR = os.path.join(tempfile.gettempdir(), - getpass.getuser(), - 'piglit', - 'python-{}'.format(sys.version.split()[0]), - 'mako-{}'.format(mako.__version__), - 'generators') +if 'PIGLIT_BUILD_TREE' in os.environ: + MAKO_TEMP_DIR = os.path.join(os.environ.get('PIGLIT_BUILD_TREE'), + 'generated_mako', 'generators') +else: + # PIGLIT_BUILD_TREE is not defined in tox testing + MAKO_TEMP_DIR = os.path.join(tempfile.gettempdir(), + getpass.getuser(), + 'piglit', + 'python-{}'.format(sys.version.split()[0]), + 'mako-{}'.format(mako.__version__), + 'generators') + TEMPLATE_DIR = os.path.abspath(os.path.dirname(__file__)) |