diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-07 15:03:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-07 19:09:41 +0300 |
| commit | 2028302f4433910dc0841c4033b951275fa3f678 (patch) | |
| tree | 3420a3d0aeab0cf26ad210dc19fc5cb825dfbb21 /build_files | |
| parent | 708e81bdfab1a7db4902c6512f009d9c4043428c (diff) | |
Tests: run tests from install path
Blender can only be run correctly from the install path since it requires Python
scripts, dynamic libraries and other files to be present. By default the install
path is the same as the build path, so it works anyway. But on the buildbot it
isn't. There was a workaround but it failed on Windows and macOS.
Now tests run from the install path. Detecting that path for ctest is more
complicated than I would like, but I couldn't find a better solution.
Ref T69541.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_test.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py index d08f433658c..b9714c1ec7a 100644 --- a/build_files/buildbot/slave_test.py +++ b/build_files/buildbot/slave_test.py @@ -22,15 +22,6 @@ import buildbot_utils import os import sys -def get_ctest_environment(builder): - info = buildbot_utils.VersionInfo(builder) - blender_version_dir = os.path.join(builder.install_dir, info.version) - - env = os.environ.copy() - env['BLENDER_SYSTEM_SCRIPTS'] = os.path.join(blender_version_dir, 'scripts') - env['BLENDER_SYSTEM_DATAFILES'] = os.path.join(blender_version_dir, 'datafiles') - return env - def get_ctest_arguments(builder): args = ['--output-on-failure'] if builder.platform == 'win': @@ -41,8 +32,7 @@ def test(builder): os.chdir(builder.build_dir) command = builder.command_prefix + ['ctest'] + get_ctest_arguments(builder) - ctest_env = get_ctest_environment(builder) - buildbot_utils.call(command, env=ctest_env, exit_on_error=False) + buildbot_utils.call(command, exit_on_error=False) if __name__ == "__main__": builder = buildbot_utils.create_builder_from_arguments() |