Author: stsp
Date: Mon Nov 13 23:29:39 2017
New Revision: 1815153
URL: http://svn.apache.org/viewvc?rev=1815153&view=rev
Log:
On the addremove branch, merge outstanding changes from trunk.
Removed:
subversion/branches/addremove/notes/commit-access-templates/contrib-committer.tmpl
Modified:
subversion/branches/addremove/ (props changed)
subversion/branches/addremove/COMMITTERS
subversion/branches/addremove/Makefile.in
subversion/branches/addremove/build.conf
subversion/branches/addremove/build/generator/gen_win_dependencies.py
subversion/branches/addremove/build/run_tests.py
subversion/branches/addremove/notes/commit-access-templates/partial-committer.tmpl
subversion/branches/addremove/subversion/libsvn_fs_fs/transaction.c
subversion/branches/addremove/subversion/libsvn_repos/reporter.c
subversion/branches/addremove/subversion/tests/cmdline/basic_tests.py
subversion/branches/addremove/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/addremove/subversion/tests/cmdline/svntest/main.py
subversion/branches/addremove/tools/dev/unix-build/Makefile.svn
subversion/branches/addremove/win-tests.py
Propchange: subversion/branches/addremove/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 13 23:29:39 2017
@@ -97,4 +97,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1802696-1813172
+/subversion/trunk:1802696-1815150
Modified: subversion/branches/addremove/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/COMMITTERS?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/COMMITTERS [UTF-8] (original)
+++ subversion/branches/addremove/COMMITTERS [UTF-8] Mon Nov 13 23:29:39 2017
@@ -169,6 +169,7 @@ Commit access for specific areas:
prabhugs Prabhu Gnana Sundar <[email protected]>
(verify-keep-going)
schabi Markus Schaber <[email protected]> (testsuite)
gbg Gabriela Gibson <[email protected]> (gtest)
+ lyalyakin Pavel Lyalyakin <[email protected]> (site)
Translation of message files:
Modified: subversion/branches/addremove/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/Makefile.in?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/Makefile.in (original)
+++ subversion/branches/addremove/Makefile.in Mon Nov 13 23:29:39 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/branches/addremove/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/build.conf?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/build.conf (original)
+++ subversion/branches/addremove/build.conf Mon Nov 13 23:29:39 2017
@@ -1471,8 +1471,7 @@ external-lib = $(SVN_SASL_LIBS)
[openssl]
type = lib
-external-lib = $(SVN_OPENSSL_LIBS)
-msvc-libs = ssleay32.lib libeay32.lib
+external-lib = $(SVN_OPENSSL_LIBS) $(SVN_LIBCRYPTO_LIBS)
[intl]
type = lib
Modified: subversion/branches/addremove/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/build/generator/gen_win_dependencies.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/build/generator/gen_win_dependencies.py
(original)
+++ subversion/branches/addremove/build/generator/gen_win_dependencies.py Mon
Nov 13 23:29:39 2017
@@ -878,16 +878,26 @@ class GenDependenciesBase(gen_base.Gener
int(vermatch.group(4)))
openssl_version = vermatch.group(1)
+ libcrypto = 'libcrypto'
+ libssl = 'libssl'
+ versuffix = '-%d_%d' % version[0:2]
+ if version < (1, 1, 0):
+ libcrypto = 'libeay32'
+ libssl = 'ssleay32'
+ versuffix = ''
+
self._libraries['openssl'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
- 'ssleay32.lib',
+ '%s.lib' % (libssl,),
openssl_version,
- dll_name='ssleay32.dll',
+ dll_name='%s%s.dll' %
+ (libssl, versuffix),
dll_dir=bin_dir)
- self._libraries['libeay32'] = SVNCommonLibrary('openssl', inc_dir, lib_dir,
- 'libeay32.lib',
+ self._libraries['libcrypto'] = SVNCommonLibrary('openssl', inc_dir,
lib_dir,
+ '%s.lib' % (libcrypto,),
openssl_version,
- dll_name='libeay32.dll',
+ dll_name='%s%s.dll' %
+ (libcrypto, versuffix),
dll_dir=bin_dir)
def _find_perl(self, show_warnings):
Modified: subversion/branches/addremove/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/build/run_tests.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/build/run_tests.py (original)
+++ subversion/branches/addremove/build/run_tests.py Mon Nov 13 23:29:39 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
@@ -424,7 +426,7 @@ class TestHarness:
os.write(sys.stdout.fileno(), b'.' * job.test_count())
- def _run_global_sheduler(self, testlist, has_py_tests):
+ def _run_global_scheduler(self, testlist, has_py_tests):
# Collect all tests to execute (separate jobs for each test in python
# test cases, one job for each c test case). Do that concurrently to
# mask latency. This takes .5s instead of about 3s.
@@ -576,7 +578,7 @@ class TestHarness:
if self.opts.global_scheduler is None:
failed = self._run_local_schedulers(testlist)
else:
- failed = self._run_global_sheduler(testlist, len(py_tests) > 0)
+ failed = self._run_global_scheduler(testlist, len(py_tests) > 0)
# Open the log again to for filtering.
if self.logfile:
@@ -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('--fsfs-dir-deltification', action='store', type='str',
+ help='Set directory deltification option (for fsfs)')
parser.set_defaults(set_log_level=None)
return parser
@@ -1036,7 +1040,9 @@ def main():
(opts, args) = create_parser().parse_args(sys.argv[1:])
if len(args) < 3:
- print(__doc__)
+ print("{}: at least three positional arguments required; got {!r}".format(
+ os.path.basename(sys.argv[0]), args
+ ))
sys.exit(2)
if opts.log_to_stdout:
Modified:
subversion/branches/addremove/notes/commit-access-templates/partial-committer.tmpl
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/notes/commit-access-templates/partial-committer.tmpl?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
---
subversion/branches/addremove/notes/commit-access-templates/partial-committer.tmpl
(original)
+++
subversion/branches/addremove/notes/commit-access-templates/partial-committer.tmpl
Mon Nov 13 23:29:39 2017
@@ -15,18 +15,20 @@ Hi New Partial Committer,
The other committers and I would like to offer you partial commit
access for maintenance of the Subversion FROBLINGS area.
-If you already have partial commit access to another area, you can
+#ifdef THE_INVITEE_ALREADY_HAS_PARTIAL_COMMIT_ACCESS_TO_ANOTHER_AREA
+Since you already have partial commit access to another area, you can
accept this offer by simply replying to this mail. We'll update the
COMMITTERS file (or you can do it yourself, that's fine too).
-If you do not already have partial commit access, you can accept this
-offer by replying to this mail and following the instructions at
-<http://www.apache.org/dev/new-committers-guide.html#cla>. You will
-receive an email with details on how to access your account. Once you
-have access to your account, you are encouraged to modify the COMMITTERS
-file appropriately, which also serves as a test of your new username and
-password.
+#else
+You can accept this offer by replying to this mail and following the
+instructions at <http://www.apache.org/dev/new-committers-guide.html#cla>.
+You will receive an email with details on how to access your account.
+Once you have access to your account, you are encouraged to modify the
+COMMITTERS file appropriately, which also serves as a test of your new
+username and password.
+#endif
Remember that you can still post patches for review before committing,
when you want to. Commit access just means that you can rely on your
own judgment to decide when something is ready for commit. Also, if
Modified: subversion/branches/addremove/subversion/libsvn_fs_fs/transaction.c
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/libsvn_fs_fs/transaction.c?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/libsvn_fs_fs/transaction.c
(original)
+++ subversion/branches/addremove/subversion/libsvn_fs_fs/transaction.c Mon Nov
13 23:29:39 2017
@@ -2697,6 +2697,8 @@ svn_fs_fs__set_proplist(svn_fs_t *fs,
{
noderev->prop_rep = apr_pcalloc(pool, sizeof(*noderev->prop_rep));
noderev->prop_rep->txn_id = *svn_fs_fs__id_txn_id(noderev->id);
+ SVN_ERR(set_uniquifier(fs, noderev->prop_rep, pool));
+ noderev->prop_rep->revision = SVN_INVALID_REVNUM;
SVN_ERR(svn_fs_fs__put_node_revision(fs, noderev->id, noderev, FALSE,
pool));
}
@@ -3259,7 +3261,8 @@ write_final_rev(const svn_fs_id_t **new_
? SVN_FS_FS__ITEM_TYPE_DIR_PROPS
: SVN_FS_FS__ITEM_TYPE_FILE_PROPS;
SVN_ERR(svn_fs_fs__get_proplist(&proplist, fs, noderev, pool));
-
+ noderev->prop_rep->txn_id = *txn_id;
+ SVN_ERR(set_uniquifier(fs, noderev->prop_rep, pool));
noderev->prop_rep->revision = rev;
if (ffd->deltify_properties)
@@ -3328,14 +3331,11 @@ write_final_rev(const svn_fs_id_t **new_
}
}
- /* don't serialize SHA1 for dirs to disk (waste of space) */
+ /* don't serialize SHA1 for dir content to disk (waste of space) */
+ /* ### Could clients record bogus last-changed-revisions (issue #4700)? */
if (noderev->data_rep && noderev->kind == svn_node_dir)
noderev->data_rep->has_sha1 = FALSE;
- /* don't serialize SHA1 for props to disk (waste of space) */
- if (noderev->prop_rep)
- noderev->prop_rep->has_sha1 = FALSE;
-
/* Workaround issue #4031: is-fresh-txn-root in revision files. */
noderev->is_fresh_txn_root = FALSE;
Modified: subversion/branches/addremove/subversion/libsvn_repos/reporter.c
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/libsvn_repos/reporter.c?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/addremove/subversion/libsvn_repos/reporter.c Mon Nov 13
23:29:39 2017
@@ -973,11 +973,11 @@ update_entry(report_baton_t *b, svn_revn
if (s_root == NULL)
SVN_ERR(get_source_root(b, &s_root, s_rev));
- SVN_ERR(svn_fs_props_different(&changed, s_root, s_path,
- b->t_root, t_path, pool));
+ SVN_ERR(svn_fs_props_changed(&changed, s_root, s_path,
+ b->t_root, t_path, pool));
if (!changed)
- SVN_ERR(svn_fs_contents_different(&changed, s_root, s_path,
- b->t_root, t_path, pool));
+ SVN_ERR(svn_fs_contents_changed(&changed, s_root, s_path,
+ b->t_root, t_path, pool));
}
if ((distance == 0 || !changed) && !any_path_info(b, e_path)
Modified: subversion/branches/addremove/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/tests/cmdline/basic_tests.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/tests/cmdline/basic_tests.py
(original)
+++ subversion/branches/addremove/subversion/tests/cmdline/basic_tests.py Mon
Nov 13 23:29:39 2017
@@ -3140,6 +3140,62 @@ def filtered_ls(sbox):
exit_code, output, error = svntest.actions.run_and_verify_svn(
[], [], 'ls', path, '--depth=infinity', '--search=*/*')
+@Issue(4700)
+def null_update_last_changed_revision(sbox):
+ "null 'update' updates last changed rev"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ # r2: Random text change.
+ old_contents = open(sbox.path("iota")).read()
+ sbox.simple_append("iota", "Line 2.\n")
+ sbox.simple_commit(message='r2')
+ sbox.simple_update()
+
+ # r3: Revert r2.
+ sbox.simple_append("iota", old_contents, truncate=True)
+ sbox.simple_commit(message='r3')
+ sbox.simple_update()
+
+ # Perform a null update.
+ #
+ # This used to say '3'; probably because iota@3 and iota@1 were textually
+ # identical. It seems this problem was introduced in r1760570.
+ sbox.simple_update(revision='1')
+ svntest.actions.run_and_verify_svn(["1\n"], [],
+ 'info', sbox.path('iota'),
+ '--show-item', 'last-changed-revision')
+
+@Issue(4700)
+@XFail(svntest.main.is_fs_type_bdb)
+def null_prop_update_last_changed_revision(sbox):
+ "null 'property update' updates last changed rev"
+
+ sbox.build()
+ wc_dir = sbox.wc_dir
+
+ sbox.simple_propset("prop", "value", "iota")
+ sbox.simple_commit(message='r2')
+ sbox.simple_update()
+
+ # r3: change the property
+ sbox.simple_propset("prop", "changed", "iota")
+ sbox.simple_commit(message='r3')
+ sbox.simple_update()
+
+ # r4: Revert r3.
+ sbox.simple_propset("prop", "value", "iota")
+ sbox.simple_commit(message='r4')
+ sbox.simple_update()
+
+ # Perform a null update.
+ sbox.simple_update(revision='2')
+ svntest.actions.run_and_verify_svn(["2\n"], [],
+ 'info', sbox.path('iota'),
+ '--show-item', 'last-changed-revision')
+
+
########################################################################
# Run the tests
@@ -3211,6 +3267,8 @@ test_list = [ None,
mkdir_parents_target_exists_on_disk,
plaintext_password_storage_disabled,
filtered_ls,
+ null_update_last_changed_revision,
+ null_prop_update_last_changed_revision,
]
if __name__ == '__main__':
Modified:
subversion/branches/addremove/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/tests/cmdline/svnadmin_tests.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/tests/cmdline/svnadmin_tests.py
(original)
+++ subversion/branches/addremove/subversion/tests/cmdline/svnadmin_tests.py
Mon Nov 13 23:29:39 2017
@@ -1676,12 +1676,12 @@ def verify_non_utf8_paths(sbox):
if line == b"A\n":
# replace 'A' with a latin1 character -- the new path is not valid UTF-8
fp_new.write(b"\xE6\n")
- elif line == b"text: 1 279 32 32 d63ecce65d8c428b86f4f8b0920921fe\n":
+ elif line == b"text: 1 340 32 32 a6be7b4cf075fd39e6a99eb69a31232b\n":
# phys, PLAIN directories: fix up the representation checksum
- fp_new.write(b"text: 1 279 32 32 b50b1d5ed64075b5f632f3b8c30cd6b2\n")
- elif line == b"text: 1 292 44 32 a6be7b4cf075fd39e6a99eb69a31232b\n":
+ fp_new.write(b"text: 1 340 32 32 f2e93e73272cac0f18fccf16f224eb93\n")
+ elif line == b"text: 1 340 44 32 a6be7b4cf075fd39e6a99eb69a31232b\n":
# phys, deltified directories: fix up the representation checksum
- fp_new.write(b"text: 1 292 44 32 f2e93e73272cac0f18fccf16f224eb93\n")
+ fp_new.write(b"text: 1 340 44 32 f2e93e73272cac0f18fccf16f224eb93\n")
elif line == b"text: 1 6 31 31 90f306aa9bfd72f456072076a2bd94f7\n":
# log addressing: fix up the representation checksum
fp_new.write(b"text: 1 6 31 31 db2d4a0bad5dff0aea9a288dec02f1fb\n")
@@ -3350,7 +3350,7 @@ def dump_no_op_change(sbox):
svntest.actions.run_and_verify_svn(expected, [], 'log', '-v',
sbox2.repo_url + '/bar')
-@XFail() # This test will XPASS on FSFS if rep-caching is disabled.
+@XFail(svntest.main.is_fs_type_bdb)
@Issue(4623)
def dump_no_op_prop_change(sbox):
"svnadmin dump with no-op property change"
Modified: subversion/branches/addremove/subversion/tests/cmdline/svntest/main.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/tests/cmdline/svntest/main.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/tests/cmdline/svntest/main.py
(original)
+++ subversion/branches/addremove/subversion/tests/cmdline/svntest/main.py Mon
Nov 13 23:29:39 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/branches/addremove/tools/dev/unix-build/Makefile.svn
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/tools/dev/unix-build/Makefile.svn?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/addremove/tools/dev/unix-build/Makefile.svn Mon Nov 13
23:29:39 2017
@@ -50,6 +50,10 @@ PWD = $(shell pwd)
UNAME = $(shell uname)
RUBY = $(shell which ruby 2>/dev/null)
ifeq ($(RUBY),)
+RUBY = $(shell which ruby24 2>/dev/null)
+ifeq ($(RUBY),)
+RUBY = $(shell which ruby23 2>/dev/null)
+ifeq ($(RUBY),)
RUBY = $(shell which ruby22 2>/dev/null)
ifeq ($(RUBY),)
RUBY = $(shell which ruby21 2>/dev/null)
@@ -64,6 +68,8 @@ endif # 1.9
endif # 2.0
endif # 2.1
endif # 2.2
+endif # 2.3
+endif # 2.4
TAG ?= none
ifeq ($(TAG),none)
@@ -95,7 +101,7 @@ SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3160200
LIBMAGIC_VER = 5.30
-RUBY_VER = 2.1.10
+RUBY_VER = 2.4.2
BZ2_VER = 1.0.6
PYTHON_VER = 2.7.13
JUNIT_VER = 4.10
@@ -125,7 +131,7 @@ SHA256_${NEON_DIST} = db0bd8cdec329b48f5
SHA256_${CYRUS_SASL_DIST} =
418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
SHA256_${SQLITE_DIST} =
65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615
SHA256_${LIBMAGIC_DIST} =
694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214
-SHA256_${RUBY_DIST} =
fb2e454d7a5e5a39eb54db0ec666f53eeb6edc593d1d2b970ae4d150b831dd20
+SHA256_${RUBY_DIST} =
93b9e75e00b262bc4def6b26b7ae8717efc252c47154abb7392e54357e6c8c9c
SHA256_${BZ2_DIST} =
a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
SHA256_${PYTHON_DIST} =
a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1
SHA256_${JUNIT_DIST} =
36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
@@ -174,7 +180,7 @@ SERF_OLD_URL = https://svn.apache.org/re
SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST)
CYRUS_SASL_URL = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
-RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.1/$(RUBY_DIST)
+RUBY_URL = https://cache.ruby-lang.org/pub/ruby/2.4/$(RUBY_DIST)
BZ2_URL = http://bzip.org/$(BZ2_VER)/$(BZ2_DIST)
PYTHON_URL = https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST)
JUNIT_URL =
https://downloads.sourceforge.net/project/junit/junit/$(JUNIT_VER)/$(JUNIT_DIST)
@@ -1111,6 +1117,7 @@ $(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(
$(call do_check_sha256,$(RUBY_DIST))
[ -d $(RUBY_OBJDIR) ] || mkdir -p $(RUBY_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(RUBY_DIST)
+ -which ghead && sed -i -e "s/head -c/ghead -c/" $(RUBY_SRCDIR)/configure
touch $@
ifeq ($(THREADING),yes)
Modified: subversion/branches/addremove/win-tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/addremove/win-tests.py?rev=1815153&r1=1815152&r2=1815153&view=diff
==============================================================================
--- subversion/branches/addremove/win-tests.py (original)
+++ subversion/branches/addremove/win-tests.py Mon Nov 13 23:29:39 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()
