Repository: cassandra-dtest Updated Branches: refs/heads/master b617ea1b0 -> b76b49e6a
ninja-fix CASSANDRA-14056 to correctly handle dtest_print_tests_only Project: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/commit/b76b49e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/tree/b76b49e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra-dtest/diff/b76b49e6 Branch: refs/heads/master Commit: b76b49e6ac895ead13dde707ab606bdef99d4894 Parents: b617ea1 Author: Jason Brown <jasedbr...@gmail.com> Authored: Sat Jun 23 04:01:42 2018 -0700 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat Jun 23 04:01:42 2018 -0700 ---------------------------------------------------------------------- run_dtests.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra-dtest/blob/b76b49e6/run_dtests.py ---------------------------------------------------------------------- diff --git a/run_dtests.py b/run_dtests.py index ecda37b..ccd60b9 100755 --- a/run_dtests.py +++ b/run_dtests.py @@ -86,22 +86,23 @@ class RunDTests(): args = parser.parse_args() - if not args.dtest_print_tests_only and args.cassandra_dir is None: - if args.cassandra_version is None: + if not args.dtest_print_tests_only: + if args.cassandra_dir is None and args.cassandra_version is None: raise Exception("Required dtest arguments were missing! You must provide either --cassandra-dir " "or --cassandra-version. Refer to the documentation or invoke the help with --help.") + # Either cassandra_version or cassandra_dir is defined, so figure out the version + CASSANDRA_VERSION = args.cassandra_version or get_version_from_build(args.cassandra_dir) + + if args.use_off_heap_memtables and ("3.0" <= CASSANDRA_VERSION < "3.4"): + raise Exception("The selected Cassandra version %s doesn't support the provided option " + "--use-off-heap-memtables, see https://issues.apache.org/jira/browse/CASSANDRA-9472 " + "for details" % CASSANDRA_VERSION) + if args.dtest_enable_debug_logging: logging.root.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG) - # Either cassandra_version or cassandra_dir is defined, so figure out the version - CASSANDRA_VERSION = args.cassandra_version or get_version_from_build(args.cassandra_dir) - - if args.use_off_heap_memtables and ("3.0" <= CASSANDRA_VERSION < "3.4"): - raise Exception("The selected Cassandra version %s doesn't support the provided option " - "--use-off-heap-memtables, see https://issues.apache.org/jira/browse/CASSANDRA-9472 " - "for details" % CASSANDRA_VERSION) # Get dictionaries corresponding to each point in the configuration matrix # we want to run, then generate a config object for each of them. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
