[Bf-blender-cvs] [b6e7e173ecd] master: Buildbot: enable tests to run again
Brecht Van Lommel
noreply at git.blender.org
Thu Sep 5 12:55:32 CEST 2019
Commit: b6e7e173ecd943fcfa6ddad91bfe86a41073c768
Author: Brecht Van Lommel
Date: Thu Sep 5 12:34:17 2019 +0200
Branches: master
https://developer.blender.org/rBb6e7e173ecd943fcfa6ddad91bfe86a41073c768
Buildbot: enable tests to run again
These will not stop the build on failure yet, first step is to get them passing
more reliably.
===================================================================
M build_files/buildbot/slave_test.py
M build_files/buildbot/slave_update.py
M build_files/utils/make_update.py
===================================================================
diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 1b6b426b621..d08f433658c 100644
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -45,12 +45,5 @@ def test(builder):
buildbot_utils.call(command, env=ctest_env, exit_on_error=False)
if __name__ == "__main__":
- print("Automated tests are still DISABLED!")
- sys.exit(0)
-
builder = buildbot_utils.create_builder_from_arguments()
test(builder)
-
- # Always exit with a success, for until we know all the tests are passing
- # on all builders.
- sys.exit(0)
diff --git a/build_files/buildbot/slave_update.py b/build_files/buildbot/slave_update.py
index 42633e1e529..39f449b87bc 100644
--- a/build_files/buildbot/slave_update.py
+++ b/build_files/buildbot/slave_update.py
@@ -28,4 +28,4 @@ if __name__ == "__main__":
# Run make update which handles all libraries and submodules.
make_update = os.path.join(builder.blender_dir, "build_files", "utils", "make_update.py")
- buildbot_utils.call([sys.executable, make_update, '--no-blender'])
+ buildbot_utils.call([sys.executable, make_update, '--no-blender', "--use-tests"])
diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index c089ca96b0c..8184674e37e 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -21,6 +21,7 @@ def parse_arguments():
parser.add_argument("--no-libraries", action="store_true")
parser.add_argument("--no-blender", action="store_true")
parser.add_argument("--no-submodules", action="store_true")
+ parser.add_argument("--use-tests", action="store_true")
parser.add_argument("--svn-command", default="svn")
parser.add_argument("--git-command", default="git")
return parser.parse_args()
@@ -29,6 +30,7 @@ args = parse_arguments()
no_libraries = args.no_libraries
no_blender = args.no_blender
no_submodules = args.no_submodules
+use_tests = args.use_tests
git_command = args.git_command
svn_command = args.svn_command
svn_non_interactive = [args.svn_command, '--non-interactive']
@@ -71,6 +73,20 @@ if not no_libraries:
svn_url_platform = svn_url + lib_platform
call(svn_non_interactive + ["checkout", svn_url_platform, lib_platform_dirpath])
+ if use_tests:
+ lib_tests = "tests"
+ lib_tests_dirpath = os.path.join(lib_dirpath, lib_tests)
+
+ if not os.path.exists(lib_tests_dirpath):
+ print_stage("Checking out Tests")
+
+ if shutil.which(svn_command) is None:
+ sys.stderr.write("svn not found, can't checkout tests\n")
+ sys.exit(1)
+
+ svn_url_tests = svn_url + lib_tests
+ call(svn_non_interactive + ["checkout", svn_url_tests, lib_tests_dirpath])
+
# Update precompiled libraries and tests
print_stage("Updating Precompiled Libraries and Tests")
More information about the Bf-blender-cvs
mailing list