Modified: subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c (original) +++ subversion/branches/remove-log-addressing/subversion/tests/svn_test_main.c Mon Feb 9 11:23:39 2015 @@ -101,6 +101,9 @@ enum test_options_e { server_minor_version_opt, allow_segfault_opt, srcdir_opt, + reposdir_opt, + reposurl_opt, + repostemplate_opt, mode_filter_opt, sqlite_log_opt, parallel_opt, @@ -135,6 +138,12 @@ static const apr_getopt_option_t cl_opti N_("don't trap seg faults (useful for debugging)")}, {"srcdir", srcdir_opt, 1, N_("directory which contains test's C source files")}, + {"repos-dir", reposdir_opt, 1, + N_("directory to create repositories in")}, + {"repos-url", reposurl_opt, 1, + N_("the url to access reposdir as")}, + {"repos-template",repostemplate_opt, 1, + N_("the repository to use as template")}, {"sqlite-logging", sqlite_log_opt, 0, N_("enable SQLite logging")}, {"parallel", parallel_opt, 0, @@ -682,12 +691,40 @@ svn_test_get_srcdir(const char **srcdir, return SVN_NO_ERROR; } +svn_error_t * +svn_test__init_auth_baton(svn_auth_baton_t **ab, + apr_pool_t *result_pool) +{ + svn_config_t *cfg_config; + + SVN_ERR(svn_config_create2(&cfg_config, FALSE, FALSE, result_pool)); + + /* Disable the crypto backends that might not be entirely + threadsafe and/or compatible with running headless. + + The windows system is just our own files, but then with user-key + encrypted data inside. */ + svn_config_set(cfg_config, + SVN_CONFIG_SECTION_AUTH, + SVN_CONFIG_OPTION_PASSWORD_STORES, + "windows-cryptoapi"); + + SVN_ERR(svn_cmdline_create_auth_baton(ab, + TRUE /* non_interactive */, + "jrandom", "rayjandom", + NULL, + TRUE /* no_auth_cache */, + FALSE /* trust_server_cert */, + cfg_config, NULL, NULL, result_pool)); + + return SVN_NO_ERROR; +} + /* Standard svn test program */ int svn_test_main(int argc, const char *argv[], int max_threads, struct svn_test_descriptor_t *test_funcs) { - const char *prog_name; int i; svn_boolean_t got_error = FALSE; apr_pool_t *pool, *test_pool; @@ -745,21 +782,19 @@ svn_test_main(int argc, const char *argv os->interleave = TRUE; /* Let options and arguments be interleaved */ /* Strip off any leading path components from the program name. */ - prog_name = strrchr(argv[0], '/'); - if (prog_name) - prog_name++; - else - { - /* Just check if this is that weird platform that uses \ instead - of / for the path separator. */ - prog_name = strrchr(argv[0], '\\'); - if (prog_name) - prog_name++; - else - prog_name = argv[0]; - } + opts.prog_name = svn_dirent_internal_style(argv[0], pool); + opts.prog_name = svn_dirent_basename(opts.prog_name, NULL); #ifdef WIN32 + /* Abuse cast in strstr() to remove .exe extension. + Value is allocated in pool by svn_dirent_internal_style() */ + { + char *exe_ext = strstr(opts.prog_name, ".exe"); + + if (exe_ext) + *exe_ext = '\0'; + } + #if _MSC_VER >= 1400 /* ### This should work for VC++ 2002 (=1300) and later */ /* Show the abort message on STDERR instead of a dialog to allow @@ -781,7 +816,7 @@ svn_test_main(int argc, const char *argv #endif if (err) - return svn_cmdline_handle_exit_error(err, pool, prog_name); + return svn_cmdline_handle_exit_error(err, pool, opts.prog_name); while (1) { const char *opt_arg; @@ -800,7 +835,7 @@ svn_test_main(int argc, const char *argv switch (opt_id) { case help_opt: - help(prog_name, pool); + help(opts.prog_name, pool); exit(0); case cleanup_opt: cleanup_mode = TRUE; @@ -815,6 +850,20 @@ svn_test_main(int argc, const char *argv SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.srcdir, opt_arg, pool)); opts.srcdir = svn_dirent_internal_style(opts.srcdir, pool); break; + case reposdir_opt: + SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.repos_dir, opt_arg, pool)); + opts.repos_dir = svn_dirent_internal_style(opts.repos_dir, pool); + break; + case reposurl_opt: + SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.repos_url, opt_arg, pool)); + opts.repos_url = svn_uri_canonicalize(opts.repos_url, pool); + break; + case repostemplate_opt: + SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.repos_template, opt_arg, + pool)); + opts.repos_template = svn_dirent_internal_style(opts.repos_template, + pool); + break; case list_opt: list_mode = TRUE; break; @@ -903,7 +952,7 @@ svn_test_main(int argc, const char *argv "------ ----- ----------------\n"; for (i = 1; i <= array_size; i++) { - if (do_test_num(prog_name, i, test_funcs, + if (do_test_num(opts.prog_name, i, test_funcs, TRUE, &opts, &header_msg, test_pool)) got_error = TRUE; @@ -924,7 +973,7 @@ svn_test_main(int argc, const char *argv continue; ran_a_test = TRUE; - if (do_test_num(prog_name, test_num, test_funcs, + if (do_test_num(opts.prog_name, test_num, test_funcs, FALSE, &opts, NULL, test_pool)) got_error = TRUE; @@ -946,7 +995,7 @@ svn_test_main(int argc, const char *argv { for (i = 1; i <= array_size; i++) { - if (do_test_num(prog_name, i, test_funcs, + if (do_test_num(opts.prog_name, i, test_funcs, FALSE, &opts, NULL, test_pool)) got_error = TRUE; @@ -958,7 +1007,7 @@ svn_test_main(int argc, const char *argv #if APR_HAS_THREADS else { - got_error = do_tests_concurrently(prog_name, test_funcs, + got_error = do_tests_concurrently(opts.prog_name, test_funcs, array_size, max_threads, &opts, test_pool);
Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svnbuild.sh Mon Feb 9 11:23:39 2015 @@ -41,7 +41,6 @@ echo "============ configure" --with-serf=/export/home/wandisco/buildbot/install \ --with-apxs=/export/home/wandisco/buildbot/install/bin/apxs \ --with-sqlite=/export/home/wandisco/buildbot/sqlite-amalgamation-3071501/sqlite3.c \ - --enable-optimize \ --disable-shared \ $OPTIMIZE_OPTION \ || exit $? Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/svn-sparc-solaris/svncheck.sh Mon Feb 9 11:23:39 2015 @@ -24,6 +24,10 @@ SVN_VER_MINOR=`awk '/define SVN_VER_MINO cd ../obj +# Use GNU iconv since the system one does not work well enough +LD_PRELOAD_64=/export/home/wandisco/buildbot/install/lib/preloadable_libiconv.so +export LD_PRELOAD_64 + if [ $SVN_VER_MINOR -eq 9 ]; then echo "============ make svnserveautocheck" make svnserveautocheck CLEANUP=1 PARALLEL=30 THREADED=1 @@ -32,31 +36,4 @@ else make check CLEANUP=1 PARALLEL=30 THREADED=1 fi -# 'make check' will FAIL due to lack of UTF-8 conversion, so whitelist -# those known failures. -known="^FAIL: (" -known="${known} subst_translate-test 1: test svn_subst_translate_string2" -known="${known}|" -known="${known} subst_translate-test 2: test svn_subst_translate_string2" -known="${known}|" -known="${known} utf-test 3: test svn_utf_cstring_to_utf8_ex2" -known="${known}|" -known="${known} utf-test 4: test svn_utf_cstring_from_utf8_ex2" -known="${known}|" -known="${known} prop_tests.py 22: test prop. handle invalid property names" -known="${known}|" -known="${known} prop_tests.py 41: svn:author with XML unsafe chars" -known="${known}|" -known="${known} svnsync_tests.py 24: copy and reencode non-UTF-8 svn:. props" -known="${known})" - -# tests.log must exist -test -f tests.log || exit 1 - -# No FAIL other than the known ones. -egrep -v "$known" tests.log | grep '^FAIL' && exit 1 - -# Over 1,000 PASS. -grep '^PASS' tests.log | wc -l | grep [1-9][0-9][0-9][0-9] >/dev/null || echo $? - exit 0 Modified: subversion/branches/remove-log-addressing/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original) +++ subversion/branches/remove-log-addressing/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Mon Feb 9 11:23:39 2015 @@ -75,7 +75,7 @@ if "%SVN_BRANCH%" GTR "1.9." ( IF ERRORLEVEL 1 ( echo [Perl tests reported error !ERRORLEVEL!] 1>&2 - REM SET result=1 + SET result=1 ) ELSE ( echo Done. ) Propchange: subversion/branches/remove-log-addressing/tools/dev/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Feb 9 11:23:39 2015 @@ -1,3 +1,4 @@ .libs fsfs-access-map logdata.py +x509-parser Modified: subversion/branches/remove-log-addressing/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/dev/unix-build/Makefile.svn?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/remove-log-addressing/tools/dev/unix-build/Makefile.svn Mon Feb 9 11:23:39 2015 @@ -1555,6 +1555,9 @@ endif echo >>[email protected] 'RedirectMatch permanent ^/svn-test-work/repositories/REDIRECT-PERM-(.*)$$ /svn-test-work/repositories/$$1' echo >>[email protected] 'RedirectMatch ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)$$ /svn-test-work/repositories/$$1' echo >>[email protected] 'Include "conf/$(SVN_REL_WC)*-custom.conf"' + echo >> [email protected] '#SVNInMemoryCacheSize 0' + echo >> [email protected] '#SVNCacheTextDeltas Off' + echo >> [email protected] '#SVNCacheRevProps Off' mv -f [email protected] $@ .PHONY: libpath Modified: subversion/branches/remove-log-addressing/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/win-tests.py?rev=1658362&r1=1658361&r2=1658362&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/win-tests.py (original) +++ subversion/branches/remove-log-addressing/win-tests.py Mon Feb 9 11:23:39 2015 @@ -866,6 +866,7 @@ elif test_swig == 'perl': perl_exe = 'perl.exe' print('-- Running Swig Perl tests --') + sys.stdout.flush() old_cwd = os.getcwd() try: os.chdir(pm_src) @@ -884,7 +885,6 @@ elif test_swig == 'perl': if (r != 0): print('[Test runner reported failure]') failed = True - sys.exit(1) elif test_swig == 'python': failed = False swig_dir = os.path.join(abs_builddir, 'swig') @@ -916,6 +916,7 @@ elif test_swig == 'python': to_dir=swig_py_svn) print('-- Running Swig Python tests --') + sys.stdout.flush() pythonpath = swig_py_dir if 'PYTHONPATH' in os.environ: @@ -954,6 +955,7 @@ elif test_swig == 'ruby': ] print('-- Running Swig Ruby tests --') + sys.stdout.flush() old_cwd = os.getcwd() try: os.chdir(ruby_subdir)
