Modified: subversion/branches/ev2-export/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/svntest/actions.py?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/branches/ev2-export/subversion/tests/cmdline/svntest/actions.py Thu May 31 22:29:24 2012 @@ -1868,7 +1868,8 @@ def enable_revprop_changes(repo_dir): pre-revprop-change hook script and (if appropriate) making it executable.""" hook_path = main.get_pre_revprop_change_hook_path(repo_dir) - main.create_python_hook_script(hook_path, 'import sys; sys.exit(0)') + main.create_python_hook_script(hook_path, 'import sys; sys.exit(0)', + cmd_alternative='@exit /b 0') def disable_revprop_changes(repo_dir): """Disable revprop changes in the repository at REPO_DIR by creating a @@ -1878,8 +1879,12 @@ def disable_revprop_changes(repo_dir): hook_path = main.get_pre_revprop_change_hook_path(repo_dir) main.create_python_hook_script(hook_path, 'import sys\n' - 'sys.stderr.write("pre-revprop-change %s" % " ".join(sys.argv[1:6]))\n' - 'sys.exit(1)\n') + 'sys.stderr.write("pre-revprop-change %s" %' + ' " ".join(sys.argv[1:]))\n' + 'sys.exit(1)\n', + cmd_alternative= + '@echo pre-revprop-change %* 1>&2\n' + '@exit /b 1\n') def create_failing_post_commit_hook(repo_dir): """Create a post-commit hook script in the repository at REPO_DIR that always @@ -1888,7 +1893,10 @@ def create_failing_post_commit_hook(repo hook_path = main.get_post_commit_hook_path(repo_dir) main.create_python_hook_script(hook_path, 'import sys\n' 'sys.stderr.write("Post-commit hook failed")\n' - 'sys.exit(1)') + 'sys.exit(1)\n', + cmd_alternative= + '@echo Post-commit hook failed 1>&2\n' + '@exit /b 1\n') # set_prop can be used for properties with NULL characters which are not # handled correctly when passed to subprocess.Popen() and values like "*"
Modified: subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py (original) +++ subversion/branches/ev2-export/subversion/tests/cmdline/svntest/main.py Thu May 31 22:29:24 2012 @@ -221,7 +221,7 @@ greek_state = svntest.wc.State('', { ###################################################################### # Utilities shared by the tests -def wrap_ex(func): +def wrap_ex(func, output): "Wrap a function, catch, print and ignore exceptions" def w(*args, **kwds): try: @@ -230,9 +230,9 @@ def wrap_ex(func): if ex.__class__ != Failure or ex.args: ex_args = str(ex) if ex_args: - print('EXCEPTION: %s: %s' % (ex.__class__.__name__, ex_args)) + logger.warn('EXCEPTION: %s: %s', ex.__class__.__name__, ex_args) else: - print('EXCEPTION: %s' % ex.__class__.__name__) + logger.warn('EXCEPTION: %s', ex.__class__.__name__) return w def setup_development_mode(): @@ -902,11 +902,11 @@ def copy_repos(src_path, dst_path, head_ for dump_line in dump_stderr: match = dump_re.match(dump_line) if not match or match.group(1) != str(expect_revision): - print('ERROR: dump failed: %s' % dump_line.strip()) + logger.warn('ERROR: dump failed: %s', dump_line.strip()) raise SVNRepositoryCopyFailure expect_revision += 1 if expect_revision != head_revision + 1: - print('ERROR: dump failed; did not see revision %s' % head_revision) + logger.warn('ERROR: dump failed; did not see revision %s', head_revision) raise SVNRepositoryCopyFailure load_re = re.compile(r'^------- Committed revision (\d+) >>>\r?$') @@ -915,11 +915,11 @@ def copy_repos(src_path, dst_path, head_ match = load_re.match(load_line) if match: if match.group(1) != str(expect_revision): - print('ERROR: load failed: %s' % load_line.strip()) + logger.warn('ERROR: load failed: %s', load_line.strip()) raise SVNRepositoryCopyFailure expect_revision += 1 if expect_revision != head_revision + 1: - print('ERROR: load failed; did not see revision %s' % head_revision) + logger.warn('ERROR: load failed; did not see revision %s', head_revision) raise SVNRepositoryCopyFailure @@ -934,18 +934,23 @@ def canonicalize_url(input): return input -def create_python_hook_script(hook_path, hook_script_code): +def create_python_hook_script(hook_path, hook_script_code, + cmd_alternative=None): """Create a Python hook script at HOOK_PATH with the specified HOOK_SCRIPT_CODE.""" if windows: - # Use an absolute path since the working directory is not guaranteed - hook_path = os.path.abspath(hook_path) - # Fill the python file. - file_write("%s.py" % hook_path, hook_script_code) - # Fill the batch wrapper file. - file_append("%s.bat" % hook_path, - "@\"%s\" %s.py %%*\n" % (sys.executable, hook_path)) + if cmd_alternative is not None: + file_write("%s.bat" % hook_path, + cmd_alternative) + else: + # Use an absolute path since the working directory is not guaranteed + hook_path = os.path.abspath(hook_path) + # Fill the python file. + file_write("%s.py" % hook_path, hook_script_code) + # Fill the batch wrapper file. + file_write("%s.bat" % hook_path, + "@\"%s\" %s.py %%*\n" % (sys.executable, hook_path)) else: # For all other platforms file_write(hook_path, "#!%s\n%s" % (sys.executable, hook_script_code)) Modified: subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_client/client-test.c Thu May 31 22:29:24 2012 @@ -689,7 +689,7 @@ test_youngest_common_ancestor(const svn_ repos_url, repos_uuid, 2, "iota", pool), svn_client__pathrev_create_with_relpath( repos_url, repos_uuid, 2, "A/iota", pool), - ctx, pool, pool)); + NULL, ctx, pool, pool)); SVN_TEST_STRING_ASSERT(svn_client__pathrev_relpath(yc_ancestor, pool), "iota"); SVN_TEST_ASSERT(yc_ancestor->rev == 1); @@ -713,7 +713,7 @@ test_youngest_common_ancestor(const svn_ repos_url, repos_uuid, 0, "", pool), svn_client__pathrev_create_with_relpath( repos_url, repos_uuid, 3, "A/ROOT", pool), - ctx, pool, pool)); + NULL, ctx, pool, pool)); SVN_TEST_STRING_ASSERT(svn_client__pathrev_relpath(yc_ancestor, pool), ""); SVN_TEST_ASSERT(yc_ancestor->rev == 0); Modified: subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c (original) +++ subversion/branches/ev2-export/subversion/tests/libsvn_delta/random-test.c Thu May 31 22:29:24 2012 @@ -189,7 +189,7 @@ generate_random_file(apr_uint32_t maxlen { const int ch = (random_bytes ? (unsigned)random_bytes[r % bytes_range] - : r % bytes_range); + : (int)(r % bytes_range)); if (buf == end) { apr_size_t ignore_length; Propchange: subversion/branches/ev2-export/subversion/tests/libsvn_wc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu May 31 22:29:24 2012 @@ -9,3 +9,4 @@ entries-compat-test op-depth-test wc-lock-tester wc-incomplete-tester +wc-queries-test Modified: subversion/branches/ev2-export/tools/buildbot/slaves/bb-openbsd/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/buildbot/slaves/bb-openbsd/svnbuild.sh?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/buildbot/slaves/bb-openbsd/svnbuild.sh (original) +++ subversion/branches/ev2-export/tools/buildbot/slaves/bb-openbsd/svnbuild.sh Thu May 31 22:29:24 2012 @@ -22,5 +22,7 @@ set -e set -x +export JAVA_HOME=/usr/local/jdk-1.7.0 + branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" (cd .. && gmake BRANCH="$branch" THREADING="no") Modified: subversion/branches/ev2-export/tools/buildbot/slaves/centos/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/buildbot/slaves/centos/svnbuild.sh?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/buildbot/slaves/centos/svnbuild.sh (original) +++ subversion/branches/ev2-export/tools/buildbot/slaves/centos/svnbuild.sh Thu May 31 22:29:24 2012 @@ -23,6 +23,7 @@ set -x export MAKEFLAGS=-j4 +export PYTHON=/usr/local/python25/bin/python echo "========= autogen.sh" ./autogen.sh || exit $? @@ -30,15 +31,17 @@ echo "========= autogen.sh" echo "========= configure" # --with-junit=/usr/share/java/junit.jar # --with-jdk=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64 \ +# --without-berkeley-db \ ./configure --enable-javahl --enable-maintainer-mode \ --with-neon=/usr \ + --with-serf=/usr/local \ --with-apxs=/usr/sbin/apxs \ - --without-berkeley-db \ + --with-berkeley-db \ --with-apr=/usr \ --with-apr-util=/usr \ --with-jdk=/opt/java/jdk1.6.0_15 \ --with-junit=/home/bt/junit-4.4.jar \ - --with-sqlite=/home/bt/sqlite-3.6.17/sqlite3.c \ + --with-sqlite=/home/bt/packages/sqlite-amalgamation-dir/sqlite3.c \ || exit $? echo "========= make" Modified: subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original) +++ subversion/branches/ev2-export/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Thu May 31 22:29:24 2012 @@ -31,12 +31,13 @@ IF NOT EXIST "imports\" ( svn co --username guest --password "" http://sharpsvn.open.collab.net/svn/sharpsvn/trunk/imports imports ) IF NOT EXIST build\imports.done ( + svn up imports copy /y imports\dev-default.build default.build nant prep-dev %NANTARGS% IF ERRORLEVEL 1 ( exit /B 1 ) - del release\bin\*svn* release\bin\_*.* + del release\bin\*svn* release\bin\_*.* 2>nul: echo. > build\imports.done ) @@ -58,6 +59,8 @@ taskkill /im svnsync.exe /f 2> nul: taskkill /im httpd.exe /f 2> nul: taskkill /im fs-test.exe /f 2> nul: taskkill /im op-depth-test.exe /f 2> nul: +taskkill /im java.exe /f 2> nul: +taskkill /im perl.exe /f 2> nul: IF EXIST "%TESTDIR%\tests\subversion\tests\cmdline\httpd\" ( rmdir /s /q "%TESTDIR%\tests\subversion\tests\cmdline\httpd" ) Modified: subversion/branches/ev2-export/tools/dev/mergegraph/mergegraph.py URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/dev/mergegraph/mergegraph.py?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/dev/mergegraph/mergegraph.py (original) +++ subversion/branches/ev2-export/tools/dev/mergegraph/mergegraph.py Thu May 31 22:29:24 2012 @@ -65,7 +65,8 @@ from pydot import Node, Edge def mergeinfo_to_node_list(mi): """Convert a mergeinfo string such as '/foo:1,3-5*' into a list of - node names such as ['foo1', 'foo3', 'foo4', 'foo5'].""" + node names such as ['foo1', 'foo3', 'foo4', 'foo5']. + """ ### Doesn't yet strip the leading slash. l = [] if mi: @@ -89,7 +90,8 @@ def mergeinfo_to_node_list(mi): class MergeGraph(pydot.Graph): """Base class, not intended for direct use. Use MergeDot for the main - graph and MergeSubgraph for a subgraph.""" + graph and MergeSubgraph for a subgraph. + """ def mk_origin_node(graph, name, label): """Add a node to the graph""" @@ -169,13 +171,15 @@ class MergeGraph(pydot.Graph): def add_annotation(graph, node, label, color='lightblue'): """Add a graph node that serves as an annotation to a normal node. - More than one annotation can be added to the same normal node.""" + More than one annotation can be added to the same normal node. + """ subg_name = node + '_annotations' def get_subgraph(graph, name): """Equivalent to pydot.Graph.get_subgraph() when there is no more than one subgraph of the given name, but working aroung a bug in - pydot.Graph.get_subgraph().""" + pydot.Graph.get_subgraph(). + """ for subg in graph.get_subgraph_list(): if subg.get_name() == name: return subg @@ -298,7 +302,12 @@ class MergeDot(MergeGraph, pydot.Dot): """Save this merge graph to the given file format. If filename is None, construct a filename from the basename of the original file (as passed to the constructor and then stored in graph.basename) and the suffix - according to the given format.""" + according to the given format. + """ if not filename: filename = graph.basename + '.' + format - pydot.Dot.write(graph, filename, format=format) + if format == 'sh': + import save_as_sh + save_as_sh.write_sh_file(graph, filename) + else: + pydot.Dot.write(graph, filename, format=format) Modified: subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/ev2-export/tools/dev/unix-build/Makefile.svn Thu May 31 22:29:24 2012 @@ -31,7 +31,11 @@ ENABLE_PERL_BINDINGS ?= yes THREADING ?= yes -ENABLE_JAVA_BINDINGS ?= no # they don't build with thread-less APR... +ifeq ($(THREADING),yes) +ENABLE_JAVA_BINDINGS ?= yes +else +ENABLE_JAVA_BINDINGS ?= no +endif USE_APR_ICONV ?= no # set to yes to use APR iconv instead of GNU iconv PARALLEL ?= 1 CLEANUP ?= 1 @@ -75,6 +79,7 @@ LIBMAGIC_VER = 5.11 RUBY_VER = 1.8.7-p358 BZ2_VER = 1.0.6 PYTHON_VER = 2.7.3 +JUNIT_VER = 4.10 BDB_DIST = db-$(BDB_VER).tar.gz APR_ICONV_DIST = apr-iconv-$(APR_ICONV_VER).tar.gz @@ -87,6 +92,7 @@ LIBMAGIC_DIST = file-$(LIBMAGIC_VER).tar RUBY_DIST = ruby-$(RUBY_VER).tar.gz BZ2_DIST = bzip2-$(BZ2_VER).tar.gz PYTHON_DIST = Python-$(PYTHON_VER).tgz +JUNIT_DIST = junit-${JUNIT_VER}.jar DISTFILES = $(DISTDIR)/$(NEON_DIST) \ $(DISTDIR)/$(SERF_DIST) \ @@ -98,7 +104,8 @@ DISTFILES = $(DISTDIR)/$(NEON_DIST) \ $(DISTDIR)/$(LIBMAGIC_DIST) \ $(DISTDIR)/$(RUBY_DIST) \ $(DISTDIR)/$(BZ2_DIST) \ - $(DISTDIR)/$(PYTHON_DIST) + $(DISTDIR)/$(PYTHON_DIST) \ + $(DISTDIR)/$(JUNIT_DIST) FETCH_CMD = wget -c @@ -119,6 +126,8 @@ LIBMAGIC_URL = ftp://ftp.astron.com/pub/ RUBY_URL = http://ftp.ruby-lang.org/pub/ruby/1.8/$(RUBY_DIST) BZ2_URL = http://bzip.org/$(BZ2_VER)/$(BZ2_DIST) PYTHON_URL = http://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST) +JUNIT_URL = http://cloud.github.com/downloads/KentBeck/junit/$(JUNIT_DIST) + BDB_SRCDIR = $(SRCDIR)/db-$(BDB_VER) APR_SRCDIR = $(SRCDIR)/apr-$(APR_VER) @@ -1072,6 +1081,14 @@ $(PYTHON_OBJDIR)/.installed: $(PYTHON_OB ####################################################################### +# junit +####################################################################### + +# fetch distfile for junit +$(DISTDIR)/$(JUNIT_DIST): + cd $(DISTDIR) && $(FETCH_CMD) $(JUNIT_URL) + +####################################################################### # svn ####################################################################### @@ -1168,7 +1185,7 @@ endif ifeq ($(ENABLE_JAVA_BINDINGS),yes) JAVAHL_FLAG=--enable-javahl=yes --with-jdk --with-jikes=no \ - --with-junit=$(PWD)/junit.jar + --with-junit=$(DISTDIR)/$(JUNIT_DIST) else JAVAHL_FLAG=--enable-javahl=no endif @@ -1182,13 +1199,7 @@ SVN_WITH_SASL=--with-sasl="$(PREFIX)/cyr endif # configure svn -$(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved - @if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ - if [ ! -e $(PWD)/junit.jar ]; then \ - echo "Please provide $(PWD)/junit.jar"; \ - exit 1; \ - fi; \ - fi +$(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIST) cd $(SVN_SRCDIR) && ./autogen.sh cd $(svn_builddir) && \ env LDFLAGS="-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib" \ Modified: subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c (original) +++ subversion/branches/ev2-export/tools/server-side/svnauthz-validate.c Thu May 31 22:29:24 2012 @@ -94,6 +94,7 @@ main(int argc, const char **argv) if (err) { svn_handle_error2(err, stderr, FALSE, "svnauthz-validate: "); + svn_error_clear(err); return 1; } else Modified: subversion/branches/ev2-export/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/win-tests.py?rev=1344934&r1=1344933&r2=1344934&view=diff ============================================================================== --- subversion/branches/ev2-export/win-tests.py (original) +++ subversion/branches/ev2-export/win-tests.py Thu May 31 22:29:24 2012 @@ -534,6 +534,12 @@ class Httpd: fp.write(self._svn_module('dav_svn_module', 'mod_dav_svn.so')) fp.write(self._svn_module('authz_svn_module', 'mod_authz_svn.so')) + # Don't handle .htaccess, symlinks, etc. + fp.write('<Directory />\n') + fp.write('AllowOverride None\n') + fp.write('Options None\n') + fp.write('</Directory>\n\n') + # Define two locations for repositories fp.write(self._svn_repo('repositories')) fp.write(self._svn_repo('local_tmp')) @@ -562,9 +568,10 @@ class Httpd: def _create_users_file(self): "Create users file" htpasswd = os.path.join(self.httpd_dir, 'bin', 'htpasswd.exe') - os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mbc', self.httpd_users, + # Create the cheapest to compare password form for our testsuite + os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bcp', self.httpd_users, 'jrandom', 'rayjandom']) - os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-mb', self.httpd_users, + os.spawnv(os.P_WAIT, htpasswd, ['htpasswd.exe', '-bp', self.httpd_users, 'jconstant', 'rayjandom']) def _create_mime_types_file(self):
