You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2017/10/31 15:55:28 UTC
svn commit: r1813897 - in /subversion/trunk: Makefile.in build/run_tests.py
subversion/tests/cmdline/svntest/main.py win-tests.py
Author: stsp
Date: Tue Oct 31 15:55:28 2017
New Revision: 1813897
URL: http://svn.apache.org/viewvc?rev=1813897&view=rev
Log:
Make it possible to run tests with FSFS directory deltification disabled.
* Makefile.in: Add FSFS_DIR_DELTIFICATION option for 'make check'.
* build/run_tests.py:
(usage): Document --fsfs-dir-deltification option.
(TestHarness, create_parser): Add --fsfs-dir-deltification option.
* subversion/tests/cmdline/svntest/main.py
(_post_create_repos): Set the enable-dir-deltification parameter
in fsfs.conf if the --fsfs-dir-deltification option was provided.
(TestSpawningThread, _create_parser): Add --fsfs-dir-deltification.
* win-tests.py: Add --fsfs-dir-deltification option.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/run_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/win-tests.py
Modified: subversion/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1813897&r1=1813896&r2=1813897&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Tue Oct 31 15:55:28 2017
@@ -595,6 +595,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
if test "$(FSFS_COMPRESSION)" != ""; then \
flags="--fsfs-compression $(FSFS_COMPRESSION) $$flags"; \
fi; \
+ if test "$(FSFS_DIR_DELTIFICATION)" != ""; then \
+ flags="--fsfs-dir-deltification $(FSFS_DIR_DELTIFICATION) $$flags";\
+ fi; \
LD_LIBRARY_PATH='$(auth_plugin_dirs):$(LD_LIBRARY_PATH)' \
$(PYTHON) $(top_srcdir)/build/run_tests.py \
--config-file $(top_srcdir)/subversion/tests/tests.conf \
Modified: subversion/trunk/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/run_tests.py?rev=1813897&r1=1813896&r2=1813897&view=diff
==============================================================================
--- subversion/trunk/build/run_tests.py (original)
+++ subversion/trunk/build/run_tests.py Tue Oct 31 15:55:28 2017
@@ -33,7 +33,7 @@
[--httpd-version=<version>] [--httpd-whitelist=<version>]
[--config-file=<file>] [--ssl-cert=<file>]
[--exclusive-wc-locks] [--memcached-server=<url:port>]
- [--fsfs-compression=<type>]
+ [--fsfs-compression=<type>] [--fsfs-dir-deltification=<true|false>]
<abs_srcdir> <abs_builddir>
<prog ...>
@@ -278,6 +278,8 @@ class TestHarness:
cmdline.append('--memcached-server=%s' % self.opts.memcached_server)
if self.opts.fsfs_compression is not None:
cmdline.append('--fsfs-compression=%s' % self.opts.fsfs_compression)
+ if self.opts.fsfs_dir_deltification is not None:
+ cmdline.append('--fsfs-dir-deltification=%s' % self.opts.fsfs_dir_deltification)
self.py_test_cmdline = cmdline
@@ -1028,6 +1030,8 @@ def create_parser():
help='Use memcached server at specified URL (FSFS only)')
parser.add_option('--fsfs-compression', action='store', type='str',
help='Set compression type (for fsfs)')
+ parser.add_option('--foo-dir-deltification', action='store', type='str',
+ help='Set directory deltification option (for fsfs)')
parser.set_defaults(set_log_level=None)
return parser
Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1813897&r1=1813896&r2=1813897&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Oct 31 15:55:28 2017
@@ -1043,7 +1043,8 @@ def _post_create_repos(path, minor_versi
shutil.copy(options.config_file, confpath)
if options.memcached_server is not None or \
- options.fsfs_compression is not None and \
+ options.fsfs_compression is not None or \
+ options.fsfs_dir_deltification is not None and \
os.path.exists(confpath):
with open(confpath, 'r') as conffile:
newlines = []
@@ -1051,6 +1052,10 @@ def _post_create_repos(path, minor_versi
if line.startswith('# compression ') and \
options.fsfs_compression is not None:
line = 'compression = %s\n' % options.fsfs_compression
+ if line.startswith('# enable-dir-deltification ') and \
+ options.fsfs_dir_deltification is not None:
+ line = 'enable-dir-deltification = %s\n' % \
+ options.fsfs_dir_deltification
newlines += line
if options.memcached_server is not None and \
line == '[memcached-servers]\n':
@@ -1739,6 +1744,8 @@ class TestSpawningThread(threading.Threa
args.append('--dump-load-cross-check')
if options.fsfs_compression:
args.append('--fsfs-compression=' + options.fsfs_compression)
+ if options.fsfs_dir_deltification:
+ args.append('--fsfs-dir-deltification=' + options.fsfs_dir_deltification)
result, stdout_lines, stderr_lines = spawn_process(command, 0, False, None,
*args)
@@ -2153,6 +2160,8 @@ def _create_parser(usage=None):
help='Use memcached server at specified URL (FSFS only)')
parser.add_option('--fsfs-compression', action='store', type='str',
help='Set compression type (for fsfs)')
+ parser.add_option('--fsfs-dir-deltification', action='store', type='str',
+ help='Set directory deltification option (for fsfs)')
# most of the defaults are None, but some are other values, set them here
parser.set_defaults(
Modified: subversion/trunk/win-tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/win-tests.py?rev=1813897&r1=1813896&r2=1813897&view=diff
==============================================================================
--- subversion/trunk/win-tests.py (original)
+++ subversion/trunk/win-tests.py Tue Oct 31 15:55:28 2017
@@ -192,6 +192,7 @@ memcached_dir = None
skip_c_tests = None
dump_load_cross_check = None
fsfs_compression = None
+fsfs_dir_deltification = None
for opt, val in opts:
if opt in ('-h', '--help'):
@@ -288,6 +289,8 @@ for opt, val in opts:
run_memcached = 1
elif opt == '--fsfs-compression':
fsfs_compression = val
+ elif opt == '--fsfs-dir-deltification':
+ fsfs_dir_deltification = val
# Calculate the source and test directory names
abs_srcdir = os.path.abspath("")
@@ -1114,6 +1117,7 @@ if not test_javahl and not test_swig:
opts.skip_c_tests = skip_c_tests
opts.dump_load_cross_check = dump_load_cross_check
opts.fsfs_compression = fsfs_compression
+ opts.fsfs_dir_deltification = fsfs_dir_deltification
th = run_tests.TestHarness(abs_srcdir, abs_builddir,
log_file, fail_log_file, opts)
old_cwd = os.getcwd()