Modified: subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py (original) +++ subversion/branches/javahl-ra/subversion/tests/cmdline/update_tests.py Thu Jun 21 05:54:42 2012 @@ -310,7 +310,6 @@ def update_binary_file_2(sbox): #---------------------------------------------------------------------- -@XFail() @Issue(4128) def update_binary_file_3(sbox): "update locally modified file to equal versions" @@ -367,7 +366,7 @@ def update_binary_file_3(sbox): # Create expected output tree for an update to rev 2. expected_output = svntest.wc.State(wc_dir, { - 'A/theta' : Item(status=' '), + 'A/theta' : Item(status='G '), }) # Create expected disk tree for the update @@ -3915,8 +3914,12 @@ def update_accept_conflicts(sbox): # Accept the pre-update base file. svntest.actions.run_and_verify_svn(None, ["Updating '%s':\n" % (mu_path_backup), - 'G %s\n' % (mu_path_backup,), - 'Updated to revision 2.\n'], + 'C %s\n' % (mu_path_backup,), + 'Updated to revision 2.\n', + "Resolved conflicted state of '%s'\n" + % (mu_path_backup), + 'Summary of conflicts:\n', + ' Text conflicts: 1\n'], [], 'update', '--accept=base', mu_path_backup) @@ -3925,8 +3928,12 @@ def update_accept_conflicts(sbox): # Accept the user's working file. svntest.actions.run_and_verify_svn(None, ["Updating '%s':\n" % (alpha_path_backup), - 'G %s\n' % (alpha_path_backup,), - 'Updated to revision 2.\n'], + 'C %s\n' % (alpha_path_backup,), + 'Updated to revision 2.\n', + "Resolved conflicted state of '%s'\n" + % (alpha_path_backup), + 'Summary of conflicts:\n', + ' Text conflicts: 1\n'], [], 'update', '--accept=mine-full', alpha_path_backup) @@ -3935,8 +3942,12 @@ def update_accept_conflicts(sbox): # Accept their file. svntest.actions.run_and_verify_svn(None, ["Updating '%s':\n" % (beta_path_backup), - 'G %s\n' % (beta_path_backup,), - 'Updated to revision 2.\n'], + 'C %s\n' % (beta_path_backup,), + 'Updated to revision 2.\n', + "Resolved conflicted state of '%s'\n" + % (beta_path_backup), + 'Summary of conflicts:\n', + ' Text conflicts: 1\n'], [], 'update', '--accept=theirs-full', beta_path_backup) @@ -3947,8 +3958,12 @@ def update_accept_conflicts(sbox): # svn to exit with an exit code of 0. svntest.actions.run_and_verify_svn2(None, ["Updating '%s':\n" % (pi_path_backup), - 'G %s\n' % (pi_path_backup,), - 'Updated to revision 2.\n'], + 'C %s\n' % (pi_path_backup,), + 'Updated to revision 2.\n', + "Resolved conflicted state of '%s'\n" + % (pi_path_backup), + 'Summary of conflicts:\n', + ' Text conflicts: 1\n'], "system(.*) returned.*", 0, 'update', '--accept=edit', pi_path_backup) @@ -4096,14 +4111,27 @@ interactive-conflicts = true wc_dir, '--config-dir', config_dir) # Now update -r1 again. Hopefully we don't get a checksum error! - expected_output = svntest.wc.State(wc_dir, {}) + expected_output = svntest.wc.State(wc_dir, { + 'iota': Item(verb="Skipped"), + }) + + # The interactive callback aborts, so the file remains in conflict. + expected_disk.tweak('iota', contents="This is the file 'iota'.\n" + "<<<<<<< .mine\n" + "Local mods to r1 text.\n" + "=======\n" + "Appended text in r2.\n" + ">>>>>>> .r2\n"), + expected_disk.add({ + 'iota.r1' : Item(contents="This is the file 'iota'.\n"), + 'iota.r2' : Item(contents="This is the file 'iota'.\n" + "Appended text in r2.\n"), + 'iota.mine' : Item(contents="This is the file 'iota'.\n" + "Local mods to r1 text.\n"), + }) - # note: it's possible that the correct disk here should be the - # merged file? - expected_disk.tweak('iota', contents=("This is the file 'iota'.\n" - "Local mods to r1 text.\n")) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) - expected_status.tweak('iota', status='M ') + expected_status.tweak('iota', status='C ', wc_rev=2) svntest.actions.run_and_verify_update(wc_dir, expected_output,
Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_delta/random-test.c Thu Jun 21 05:54:42 2012 @@ -198,7 +198,7 @@ generate_random_file(apr_uint32_t maxlen buf = file_buffer; } - *buf++ = ch; + *buf++ = (char)ch; r = r * 1103515245 + 12345; } } @@ -336,10 +336,11 @@ random_test(apr_pool_t *pool) delta_pool); /* Make stage 1: create the text delta. */ - svn_txdelta(&txdelta_stream, - svn_stream_from_aprfile(source, delta_pool), - svn_stream_from_aprfile(target, delta_pool), - delta_pool); + svn_txdelta2(&txdelta_stream, + svn_stream_from_aprfile(source, delta_pool), + svn_stream_from_aprfile(target, delta_pool), + FALSE, + delta_pool); SVN_ERR(svn_txdelta_send_txstream(txdelta_stream, handler, @@ -421,15 +422,17 @@ do_random_combine_test(apr_pool_t *pool, /* Make stage 1: create the text deltas. */ - svn_txdelta(&txdelta_stream_A, - svn_stream_from_aprfile(source, delta_pool), - svn_stream_from_aprfile(middle, delta_pool), - delta_pool); - - svn_txdelta(&txdelta_stream_B, - svn_stream_from_aprfile(middle_copy, delta_pool), - svn_stream_from_aprfile(target, delta_pool), - delta_pool); + svn_txdelta2(&txdelta_stream_A, + svn_stream_from_aprfile(source, delta_pool), + svn_stream_from_aprfile(middle, delta_pool), + FALSE, + delta_pool); + + svn_txdelta2(&txdelta_stream_B, + svn_stream_from_aprfile(middle_copy, delta_pool), + svn_stream_from_aprfile(target, delta_pool), + FALSE, + delta_pool); { svn_txdelta_window_t *window_A; Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_delta/svndiff-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_delta/svndiff-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_delta/svndiff-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_delta/svndiff-test.c Thu Jun 21 05:54:42 2012 @@ -75,10 +75,11 @@ main(int argc, char **argv) if (argc == 4) version = atoi(argv[3]); - svn_txdelta(&txdelta_stream, - svn_stream_from_aprfile(source_file, pool), - svn_stream_from_aprfile(target_file, pool), - pool); + svn_txdelta2(&txdelta_stream, + svn_stream_from_aprfile(source_file, pool), + svn_stream_from_aprfile(target_file, pool), + FALSE, + pool); err = svn_stream_for_stdout(&stdout_stream, pool); if (err) Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_delta/vdelta-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_delta/vdelta-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_delta/vdelta-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_delta/vdelta-test.c Thu Jun 21 05:54:42 2012 @@ -28,6 +28,7 @@ #include "../svn_test.h" +#include "svn_ctype.h" #include "svn_delta.h" #include "svn_error.h" #include "svn_pools.h" @@ -59,10 +60,11 @@ do_one_diff(apr_file_t *source_file, apr *count = 0; *len = 0; - svn_txdelta(&delta_stream, - svn_stream_from_aprfile(source_file, fpool), - svn_stream_from_aprfile(target_file, fpool), - fpool); + svn_txdelta2(&delta_stream, + svn_stream_from_aprfile(source_file, fpool), + svn_stream_from_aprfile(target_file, fpool), + FALSE, + fpool); do { svn_error_t *err; err = svn_txdelta_next_window(&delta_window, delta_stream, wpool); @@ -82,75 +84,17 @@ do_one_diff(apr_file_t *source_file, apr } -static apr_file_t * -open_binary_read(const char *path, apr_pool_t *pool) -{ - apr_status_t apr_err; - apr_file_t *fp; - - apr_err = apr_file_open(&fp, path, (APR_READ | APR_BINARY), - APR_OS_DEFAULT, pool); - - if (apr_err) - { - fprintf(stderr, "unable to open \"%s\" for reading\n", path); - exit(1); - } - - return fp; -} - - -int -main(int argc, char **argv) +static void +do_one_test_cycle(apr_file_t *source_file_A, apr_file_t *target_file_A, + apr_file_t *source_file_B, apr_file_t *target_file_B, + int quiet, apr_pool_t *pool) { - apr_file_t *source_file_A = NULL; - apr_file_t *target_file_A = NULL; int count_A = 0; apr_off_t len_A = 0; - apr_file_t *source_file_B = NULL; - apr_file_t *target_file_B = NULL; int count_B = 0; apr_off_t len_B = 0; - apr_pool_t *pool; - int quiet = 0; - - if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'q') - { - quiet = 1; - --argc; ++argv; - } - - apr_initialize(); - pool = svn_pool_create(NULL); - - if (argc == 2) - { - target_file_A = open_binary_read(argv[1], pool); - } - else if (argc == 3) - { - source_file_A = open_binary_read(argv[1], pool); - target_file_A = open_binary_read(argv[2], pool); - } - else if (argc == 4) - { - source_file_A = open_binary_read(argv[1], pool); - target_file_A = open_binary_read(argv[2], pool); - source_file_B = open_binary_read(argv[2], pool); - target_file_B = open_binary_read(argv[3], pool); - } - else - { - fprintf(stderr, - "Usage: vdelta-test [-q] <target>\n" - " or: vdelta-test [-q] <source> <target>\n" - " or: vdelta-test [-q] <source> <intermediate> <target>\n"); - exit(1); - } - do_one_diff(source_file_A, target_file_A, &count_A, &len_A, quiet, pool, "A ", stdout); @@ -181,14 +125,16 @@ main(int argc, char **argv) apr_file_seek(target_file_B, APR_SET, &offset); } - svn_txdelta(&stream_A, - svn_stream_from_aprfile(source_file_A, fpool), - svn_stream_from_aprfile(target_file_A, fpool), - fpool); - svn_txdelta(&stream_B, - svn_stream_from_aprfile(source_file_B, fpool), - svn_stream_from_aprfile(target_file_B, fpool), - fpool); + svn_txdelta2(&stream_A, + svn_stream_from_aprfile(source_file_A, fpool), + svn_stream_from_aprfile(target_file_A, fpool), + FALSE, + fpool); + svn_txdelta2(&stream_B, + svn_stream_from_aprfile(source_file_B, fpool), + svn_stream_from_aprfile(target_file_B, fpool), + FALSE, + fpool); for (count_AB = 0; count_AB < count_B; ++count_AB) { @@ -219,6 +165,98 @@ main(int argc, char **argv) fprintf(stdout, "AB: (LENGTH %" APR_OFF_T_FMT " +%d)\n", len_AB, count_AB); } +} + + +static apr_file_t * +open_binary_read(const char *path, apr_pool_t *pool) +{ + apr_status_t apr_err; + apr_file_t *fp; + + apr_err = apr_file_open(&fp, path, (APR_READ | APR_BINARY), + APR_OS_DEFAULT, pool); + + if (apr_err) + { + fprintf(stderr, "unable to open \"%s\" for reading\n", path); + exit(1); + } + + return fp; +} + + +int +main(int argc, char **argv) +{ + apr_file_t *source_file_A = NULL; + apr_file_t *target_file_A = NULL; + + apr_file_t *source_file_B = NULL; + apr_file_t *target_file_B = NULL; + + apr_pool_t *pool; + int quiet = 0; + int repeat = 1; + + while (argc > 1) + { + const char *const arg = argv[1]; + if (arg[0] != '-') + break; + + if (arg[1] == 'q') + quiet = 1; + else if (svn_ctype_isdigit(arg[1])) + repeat = atoi(arg + 1); + else + break; + --argc; ++argv; + } + + apr_initialize(); + pool = svn_pool_create(NULL); + + if (argc == 2) + { + target_file_A = open_binary_read(argv[1], pool); + } + else if (argc == 3) + { + source_file_A = open_binary_read(argv[1], pool); + target_file_A = open_binary_read(argv[2], pool); + } + else if (argc == 4) + { + source_file_A = open_binary_read(argv[1], pool); + target_file_A = open_binary_read(argv[2], pool); + source_file_B = open_binary_read(argv[2], pool); + target_file_B = open_binary_read(argv[3], pool); + } + else + { + fprintf(stderr, + "Usage: vdelta-test [-q] [-<repeat>] <target>\n" + " or: vdelta-test [-q] [-<repeat>] <source> <target>\n" + " or: vdelta-test [-q] [-<repeat>] " + "<source> <intermediate> <target>\n"); + exit(1); + } + + while (0 < repeat--) + { + apr_off_t offset = 0; + + do_one_test_cycle(source_file_A, target_file_A, + source_file_B, target_file_B, + quiet, pool); + + if (source_file_A) apr_file_seek(source_file_A, APR_SET, &offset); + if (target_file_A) apr_file_seek(target_file_A, APR_SET, &offset); + if (source_file_B) apr_file_seek(source_file_B, APR_SET, &offset); + if (target_file_B) apr_file_seek(target_file_B, APR_SET, &offset); + } if (source_file_A) apr_file_close(source_file_A); if (target_file_A) apr_file_close(target_file_A); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_delta/window-test.c Thu Jun 21 05:54:42 2012 @@ -70,7 +70,7 @@ stream_window_test(apr_pool_t *pool) target_str.len = 109000; target_stream = svn_stream_from_string(&target_str, pool); - svn_txdelta(&txstream, source_stream, target_stream, pool); + svn_txdelta2(&txstream, source_stream, target_stream, TRUE, pool); while (1) { Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_repos/repos-test.c Thu Jun 21 05:54:42 2012 @@ -2256,7 +2256,7 @@ prop_validation(const svn_test_opts_t *o { svn_error_t *err; svn_repos_t *repos; - const char non_utf8_string[5] = { 'a', 0xff, 'b', '\n', 0 }; + const char non_utf8_string[5] = { 'a', (char)0xff, 'b', '\n', 0 }; const char *non_lf_string = "a\r\nb\n\rc\rd\n"; apr_pool_t *subpool = svn_pool_create(pool); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Jun 21 05:54:42 2012 @@ -2019,15 +2019,34 @@ test_dirent_condense_targets(apr_pool_t const char* common; apr_array_header_t *hdr = apr_array_make(pool, 8, sizeof(const char*)); apr_array_header_t *condensed; + svn_boolean_t skip = FALSE; for (j = 0; j < COUNT_OF(tests[i].paths); j++) { if (tests[i].paths[j] != NULL) - APR_ARRAY_PUSH(hdr, const char*) = tests[i].paths[j]; + { + APR_ARRAY_PUSH(hdr, const char*) = tests[i].paths[j]; +#ifdef SVN_USE_DOS_PATHS + /* For tests that are referencing a D: drive, specifically test + if such a drive exists on the system. If not, skip the test + (svn_dirent_condense_targets will fail, because + apr_filepath_merge will produce an APR_EBADPATH error). */ + if (strncmp(tests[i].paths[j], "D:", 2) == 0 + && GetDriveType("D:\\") == DRIVE_NO_ROOT_DIR) + { + /* There is no D: drive, skip this. */ + skip = TRUE; + break; + } +#endif + } else break; } + if (skip) + continue; + SVN_ERR(svn_dirent_condense_targets(&common, &condensed, hdr, FALSE, pool, pool)); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/mergeinfo-test.c Thu Jun 21 05:54:42 2012 @@ -712,7 +712,7 @@ test_merge_mergeinfo(apr_pool_t *pool) SVN_ERR(svn_mergeinfo_to_string(&info2_starting, info2, pool)); SVN_ERR(svn_mergeinfo_merge(info1, info2, pool)); - if (mergeinfo[i].expected_paths != apr_hash_count(info1)) + if (mergeinfo[i].expected_paths != (int)apr_hash_count(info1)) return fail(pool, "Wrong number of paths in merged mergeinfo"); /* Check that info2 remained unchanged. */ Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/named_atomic-test.c Thu Jun 21 05:54:42 2012 @@ -82,7 +82,10 @@ proc_found(const char *proc, apr_pool_t /* all processes and their I/O data */ apr_proc_t process; - const char * args[2] = {proc, NULL}; + const char * args[2]; + + args[0] = proc; + args[1] = NULL; svn_error_clear(adjust_proc_path(&args[0], &directory, pool)); /* try to start the process */ @@ -307,15 +310,14 @@ run_procs(apr_pool_t *pool, const char * /* start sub-processes */ for (i = 0; i < count; ++i) { - const char * args[6] = - { - proc, - apr_itoa(pool, i), - apr_itoa(pool, count), - apr_itoa(pool, iterations), - name_namespace, - NULL - }; + const char * args[6]; + + args[0] = proc; + args[1] = apr_itoa(pool, i); + args[2] = apr_itoa(pool, count); + args[3] = apr_itoa(pool, iterations); + args[4] = name_namespace; + args[5] = NULL; error = svn_io_start_cmd3(&process[i], directory, /* working directory */ Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/skel-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/skel-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/skel-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/skel-test.c Thu Jun 21 05:54:42 2012 @@ -216,7 +216,7 @@ gen_implicit_length_all_chars(apr_size_t for (i = 0; i < 256; i++) if (! skel_is_space( (apr_byte_t)i) && ! skel_is_paren( (apr_byte_t)i)) - name[pos++] = i; + name[pos++] = (char)i; *len_p = pos; return name; @@ -375,7 +375,7 @@ parse_explicit_length(apr_pool_t *pool) { char buf[1]; - buf[0] = i; + buf[0] = (char)i; SVN_ERR(try_explicit_length(buf, 1, 1, pool)); } } @@ -386,7 +386,7 @@ parse_explicit_length(apr_pool_t *pool) char data[256]; for (i = 0; i < 256; i++) - data[i] = i; + data[i] = (char)i; SVN_ERR(try_explicit_length(data, 256, 256, pool)); } @@ -592,7 +592,7 @@ parse_list(apr_pool_t *pool) svn_skel_t *child; char buf[1]; - buf[0] = atom_byte; + buf[0] = (char)atom_byte; put_list_start(str, (apr_byte_t)sep, sep_count); for (i = 0; i < list_len; i++) @@ -619,7 +619,7 @@ parse_list(apr_pool_t *pool) char data[256]; for (i = 0; i < 256; i++) - data[i] = i; + data[i] = (char)i; put_list_start(str, (apr_byte_t)sep, sep_count); for (i = 0; i < list_len; i++) @@ -797,7 +797,7 @@ unparse_list(apr_pool_t *pool) for (byte = 0; byte < 256; byte++) if (skel_is_name( (apr_byte_t)byte)) { - char buf = byte; + char buf = (char)byte; add(build_atom(1, &buf, pool), list); } @@ -858,7 +858,7 @@ unparse_list(apr_pool_t *pool) val = i * 10 + j; for (k = 0; k < sizeof(buf); k++) { - buf[k] = val; + buf[k] = (char)val; val += j; } Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c Thu Jun 21 05:54:42 2012 @@ -138,7 +138,7 @@ generate_test_bytes(int num_bytes, apr_p { if (c == 127) repeat++; - c = (c + 1) % 127; + c = (char)((c + 1) % 127); repeat_iter = repeat; } } Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/string-test.c Thu Jun 21 05:54:42 2012 @@ -529,11 +529,11 @@ test24(apr_pool_t *pool) SVN_TEST_ASSERT(length == 19); SVN_TEST_STRING_ASSERT(buffer, "9223372036854775807"); - length = svn__ui64toa(buffer, 0); + length = svn__ui64toa(buffer, 0ull); SVN_TEST_ASSERT(length == 1); SVN_TEST_STRING_ASSERT(buffer, "0"); - length = svn__ui64toa(buffer, 0xffffffffffffffffll); + length = svn__ui64toa(buffer, 0xffffffffffffffffull); SVN_TEST_ASSERT(length == 20); SVN_TEST_STRING_ASSERT(buffer, "18446744073709551615"); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/utf-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/utf-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/utf-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/utf-test.c Thu Jun 21 05:54:42 2012 @@ -197,7 +197,7 @@ utf_validate2(apr_pool_t *pool) /* A random string; experiment shows that it's occasionally (less than 1%) valid but usually invalid. */ for (j = 0; j < sizeof(str) - 1; ++j) - str[j] = range_rand(0, 255); + str[j] = (char)range_rand(0, 255); str[sizeof(str) - 1] = 0; len = strlen(str); Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/branches/javahl-ra/subversion/tests/libsvn_wc/op-depth-test.c Thu Jun 21 05:54:42 2012 @@ -238,7 +238,10 @@ wc_update(svn_test__sandbox_t *b, const apr_array_header_t *result_revs; apr_array_header_t *paths = apr_array_make(b->pool, 1, sizeof(const char *)); - svn_opt_revision_t revision = { svn_opt_revision_number, { revnum } }; + svn_opt_revision_t revision; + + revision.kind = svn_opt_revision_number; + revision.value.number = revnum; APR_ARRAY_PUSH(paths, const char *) = wc_path(b, path); SVN_ERR(svn_client_create_context(&ctx, b->pool)); @@ -455,8 +458,12 @@ check_db_rows(svn_test__sandbox_t *b, svn_boolean_t have_row; apr_hash_t *found_hash = apr_hash_make(b->pool); apr_hash_t *expected_hash = apr_hash_make(b->pool); - comparison_baton_t comparison_baton - = { expected_hash, found_hash, b->pool, NULL }; + comparison_baton_t comparison_baton; + + comparison_baton.expected_hash = expected_hash; + comparison_baton.found_hash = found_hash; + comparison_baton.scratch_pool = b->pool; + comparison_baton.errors = NULL; /* Fill ACTUAL_HASH with data from the WC DB. */ SVN_ERR(open_wc_db(&sdb, b->wc_abspath, statements, b->pool, b->pool)); @@ -523,23 +530,23 @@ struct copy_subtest_t nodes_row_t expected[20]; }; +#define source_everything "A/B" + +#define source_base_file "A/B/lambda" +#define source_base_dir "A/B/E" + +#define source_added_file "A/B/file-added" +#define source_added_dir "A/B/D-added" +#define source_added_dir2 "A/B/D-added/D2" + +#define source_copied_file "A/B/lambda-copied" +#define source_copied_dir "A/B/E-copied" + /* Check that all kinds of WC-to-WC copies give correct op_depth results: * create a Greek tree, make copies in it, and check the resulting DB rows. */ static svn_error_t * wc_wc_copies(svn_test__sandbox_t *b) { - const char source_everything[] = "A/B"; - - const char source_base_file[] = "A/B/lambda"; - const char source_base_dir[] = "A/B/E"; - - const char source_added_file[] = "A/B/file-added"; - const char source_added_dir[] = "A/B/D-added"; - const char source_added_dir2[] = "A/B/D-added/D2"; - - const char source_copied_file[] = "A/B/lambda-copied"; - const char source_copied_dir[] = "A/B/E-copied"; - SVN_ERR(add_and_commit_greek_tree(b)); /* Create the various kinds of source node which will be copied */ @@ -756,13 +763,15 @@ repo_wc_copies(svn_test__sandbox_t *b) for (subtest = subtests; subtest->from_path; subtest++) { svn_opt_revision_t rev = { svn_opt_revision_number, { 1 } }; - svn_client_copy_source_t source = { NULL, &rev, &rev }; + svn_client_copy_source_t source; apr_array_header_t *sources = apr_array_make(b->pool, 0, sizeof(svn_client_copy_source_t *)); source.path = svn_path_url_add_component2(b->repos_url, subtest->from_path, b->pool); + source.revision = &rev; + source.peg_revision = &rev; APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = &source; SVN_ERR(svn_client_copy6(sources, wc_path(b, subtest->to_path), @@ -1277,7 +1286,7 @@ base_dir_insert_remove(svn_test__sandbox NULL, NULL, FALSE, NULL, NULL, b->pool)); - after = apr_palloc(b->pool, sizeof(*after) * (num_before + num_added + 1)); + after = apr_palloc(b->pool, sizeof(*after) * (apr_size_t)(num_before + num_added + 1)); for (i = 0; i < num_before; ++i) after[i] = before[i]; for (i = 0; i < num_added; ++i) Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh Thu Jun 21 05:54:42 2012 @@ -24,7 +24,7 @@ set -x branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" svn-check-bindings) +(cd .. && gmake BRANCH="$branch" THREADING="no" svn-check-bindings) grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1 grep -q "^OK$" tests.log.bindings.py || exit 1 tail -n 1 tests.log.bindings.rb | grep -q ", 0 failures, 0 errors" || exit 1 Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck.sh URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck.sh?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck.sh (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svncheck.sh Thu Jun 21 05:54:42 2012 @@ -24,11 +24,11 @@ set -x branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" export MALLOC_OPTIONS=S -(cd .. && gmake BRANCH="$branch" PARALLEL="" \ +(cd .. && gmake BRANCH="$branch" PARALLEL="" THREADING="no" \ svn-check-local \ svn-check-svn \ svn-check-neon \ svn-check-serf) -grep -q "^FAIL:" tests.log* && exit 1 -grep -q "^XPASS:" tests.log* && exit 1 +grep -q "^FAIL:" tests.log.svn-check* && exit 1 +grep -q "^XPASS:" tests.log.svn-check* && exit 1 exit 0 Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnclean.sh URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnclean.sh?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnclean.sh (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/bb-openbsd/svnclean.sh Thu Jun 21 05:54:42 2012 @@ -24,9 +24,10 @@ set -x branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))" (test -h ../svn-trunk || ln -s build ../svn-trunk) -for i in 3 4 5 6 7; do +for i in 6 7; do (test -h ../svn-1.${i}.x || ln -s build ../svn-1.${i}.x) done svn update ../../unix-build (test -h ../GNUmakefile || ln -s ../unix-build/Makefile.svn ../GNUmakefile) (cd .. && gmake BRANCH="$branch" reset clean) +rm -f tests.log* fails.log* Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd Thu Jun 21 05:54:42 2012 @@ -67,6 +67,12 @@ for %%i in (*.dll) do ( ) popd +svnversion . /1.7.x | find "S" > nul: +IF ERRORLEVEL 1 ( + ECHO --- Building 1.7.x: Skipping perl tests --- + EXIT /B %result% +) + SET PERL5LIB=%PERL5LIB%;%TESTDIR%\swig\pl-release; pushd subversion\bindings\swig\perl\native perl -MExtUtils::Command::MM -e test_harness() t\*.t Modified: subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd (original) +++ subversion/branches/javahl-ra/tools/buildbot/slaves/win32-SharpSvn/svntest-test.cmd Thu Jun 21 05:54:42 2012 @@ -51,10 +51,10 @@ IF "%1" == "-r" ( SET SVN=1 SHIFT ) ELSE IF "%1" == "serf" ( - SET SERF=1 + SET DAV=1 SHIFT -) ELSE IF "%1" == "neon" ( - SET NEON=1 +) ELSE IF "%1" == "dav" ( + SET DAV=1 SHIFT ) ELSE ( SET ARGS=!ARGS! -t %1 @@ -63,6 +63,7 @@ IF "%1" == "-r" ( IF NOT "%1" == "" GOTO next +taskkill /im svnserve.exe httpd.exe /f 2> nul: IF NOT EXIST "%TESTDIR%\bin" MKDIR "%TESTDIR%\bin" xcopy /y /i ..\deps\release\bin\*.dll "%TESTDIR%\bin" @@ -76,22 +77,13 @@ IF "%LOCAL%+%FSFS%" == "1+1" ( ) IF "%SVN%+%FSFS%" == "1+1" ( - taskkill /im svnserve.exe /f 2> nul: echo win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests" win-tests.py -c %PARALLEL% %MODE% -f fsfs -u svn://127.0.0.1 %ARGS% "%TESTDIR%\tests" IF ERRORLEVEL 1 EXIT /B 1 ) -IF "%SERF%+%FSFS%" == "1+1" ( - taskkill /im httpd.exe /f 2> nul: - echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" - win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library serf --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" - IF ERRORLEVEL 1 EXIT /B 1 -) - -IF "%NEON%+%FSFS%" == "1+1" ( - taskkill /im httpd.exe /f 2> nul: - echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" - win-tests.py -c %PARALLEL% %MODE% -f fsfs --http-library neon --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" +IF "%DAV%+%FSFS%" == "1+1" ( + echo win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" + win-tests.py -c %PARALLEL% %MODE% -f fsfs --httpd-dir "%CD%\..\deps\release\httpd" --httpd-port %TESTPORT% -u http://127.0.0.1:%TESTPORT% %ARGS% "%TESTDIR%\tests" IF ERRORLEVEL 1 EXIT /B 1 ) Modified: subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py (original) +++ subversion/branches/javahl-ra/tools/dev/gdb-py/svndbg/printers.py Thu Jun 21 05:54:42 2012 @@ -120,6 +120,8 @@ class AprHashPrinter: def to_string(self): """Return a string to be displayed before children are displayed, or return None if we don't want any such.""" + if not self.hash_p: + return 'NULL' return 'hash of ' + str(apr_hash_count(self.hash_p)) + ' items' def children(self): @@ -135,16 +137,6 @@ class PtrAprHashPrinter(AprHashPrinter): def __init__(self, val): self.hash_p = val - def to_string(self): - if not self.hash_p: - return 'NULL' - return AprHashPrinter.to_string(self) - - def children(self): - if not self.hash_p: - return [] - return AprHashPrinter.children(self) - class AprArrayPrinter: """for 'apr_array_header_t' of unknown elements""" def __init__(self, val): @@ -171,16 +163,6 @@ class PtrAprArrayPrinter(AprArrayPrinter else: self.array = val.dereference() - def to_string(self): - if not self.array: - return 'NULL' - return AprArrayPrinter.to_string(self) - - def children(self): - if not self.array: - return [] - return AprArrayPrinter.children(self) - ######################################################################## @@ -214,7 +196,10 @@ class SvnMergeinfoCatalogPrinter: def children(self): if self.hash_p == 0: - return None + # Return an empty list so GDB prints only the 'NULL' that is + # returned by to_string(). If instead we were to return None + # here, GDB would issue a 'not iterable' error message. + return [] mergeinfoType = gdb.lookup_type('svn_mergeinfo_t') return children_as_map(children_of_apr_hash(self.hash_p, mergeinfoType)) Modified: subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c (original) +++ subversion/branches/javahl-ra/tools/dev/svnraisetreeconflict/main.c Thu Jun 21 05:54:42 2012 @@ -365,10 +365,8 @@ main(int argc, const char *argv[]) if (APR_STATUS_IS_EOF(status)) break; if (status != APR_SUCCESS) - { - usage(pool); - return EXIT_FAILURE; - } + usage(pool); /* this will exit() */ + switch (opt) { case 'h': @@ -379,8 +377,7 @@ main(int argc, const char *argv[]) exit(0); break; default: - usage(pool); - return EXIT_FAILURE; + usage(pool); /* this will exit() */ } } @@ -396,10 +393,7 @@ main(int argc, const char *argv[]) } if (remaining_argv->nelts < 1) - { - usage(pool); - return EXIT_FAILURE; - } + usage(pool); /* this will exit() */ /* Do the main task */ SVNRAISETC_INT_ERR(raise_tree_conflict(remaining_argv->nelts, Modified: subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn (original) +++ subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn Thu Jun 21 05:54:42 2012 @@ -71,10 +71,10 @@ GNU_ICONV_VER = 1.14 APR_UTIL_VER = 1.4.1 HTTPD_VER = 2.2.22 NEON_VER = 0.29.6 -SERF_VER = 1.0.3 +SERF_VER = 1.1.0 SERF_OLD_VER = 0.3.1 CYRUS_SASL_VER = 2.1.25 -SQLITE_VER = 3071100 +SQLITE_VER = 3071201 LIBMAGIC_VER = 5.11 RUBY_VER = 1.8.7-p358 BZ2_VER = 1.0.6 @@ -1132,12 +1132,20 @@ $(SVN_OBJDIR)/.retrieved: fi touch $@ -ifeq ($(BRANCH_MAJOR),1.6) +ifeq ($(BRANCH_MAJOR),1.7) +BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER) +SERF_FLAG=--with-serf="$(PREFIX)/serf" +MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so +MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so +LIBMAGIC_FLAG=--with-libmagic=$(PREFIX)/libmagic +NEON_FLAG=--with-neon="$(PREFIX)/neon" +else ifeq ($(BRANCH_MAJOR),1.6) BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER) SERF_FLAG=--with-serf="$(PREFIX)/serf" MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so MOD_AUTHZ_SVN=modules/svn-$(WC)/mod_authz_svn.so W_NO_SYSTEM_HEADERS=-Wno-system-headers +NEON_FLAG=--with-neon="$(PREFIX)/neon" else ifeq ($(BRANCH_MAJOR),1.5) BDB_FLAG=$(PREFIX)/bdb SERF_FLAG=--with-serf="$(PREFIX)/serf-old" @@ -1145,37 +1153,8 @@ MOD_DAV_SVN=modules/mod_dav_svn.so MOD_AUTHZ_SVN=modules/mod_authz_svn.so DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check W_NO_SYSTEM_HEADERS=-Wno-system-headers -else ifeq ($(BRANCH_MAJOR),1.4) -BDB_FLAG=$(PREFIX)/bdb -MOD_DAV_SVN=modules/mod_dav_svn.so -MOD_AUTHZ_SVN=modules/mod_authz_svn.so -DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check -W_NO_SYSTEM_HEADERS=-Wno-system-headers -else ifeq ($(BRANCH_MAJOR),1.3) -BDB_FLAG=$(PREFIX)/bdb -MOD_DAV_SVN=modules/mod_dav_svn.so -MOD_AUTHZ_SVN=modules/mod_authz_svn.so -DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check -W_NO_SYSTEM_HEADERS=-Wno-system-headers -else ifeq ($(BRANCH_MAJOR),1.2) -BDB_FLAG=$(PREFIX)/bdb -MOD_DAV_SVN=modules/mod_dav_svn.so -MOD_AUTHZ_SVN=modules/mod_authz_svn.so -DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check -W_NO_SYSTEM_HEADERS=-Wno-system-headers -else ifeq ($(BRANCH_MAJOR),1.1) -BDB_FLAG=$(PREFIX)/bdb -MOD_DAV_SVN=modules/mod_dav_svn.so -MOD_AUTHZ_SVN=modules/mod_authz_svn.so -DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check -W_NO_SYSTEM_HEADERS=-Wno-system-headers -else ifeq ($(BRANCH_MAJOR),1.0) -BDB_FLAG=$(PREFIX)/bdb -MOD_DAV_SVN=modules/mod_dav_svn.so -MOD_AUTHZ_SVN=modules/mod_authz_svn.so -DISABLE_NEON_VERSION_CHECK=--disable-neon-version-check -W_NO_SYSTEM_HEADERS=-Wno-system-headers -else +NEON_FLAG=--with-neon="$(PREFIX)/neon" +else # 1.8 BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER) SERF_FLAG=--with-serf="$(PREFIX)/serf" MOD_DAV_SVN=modules/svn-$(WC)/mod_dav_svn.so @@ -1187,7 +1166,7 @@ ifeq ($(ENABLE_JAVA_BINDINGS),yes) JAVAHL_FLAG=--enable-javahl=yes --with-jdk --with-jikes=no \ --with-junit=$(DISTDIR)/$(JUNIT_DIST) else - JAVAHL_FLAG=--enable-javahl=no + JAVAHL_FLAG=--with-jdk=no endif ifdef PROFILE @@ -1212,7 +1191,7 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR) --prefix="$(SVN_PREFIX)" \ --with-apr="$(PREFIX)/apr" \ --with-apr-util="$(PREFIX)/apr" \ - --with-neon="$(PREFIX)/neon" \ + $(NEON_FLAG) \ $(SVN_WITH_HTTPD) \ $(SVN_WITH_SASL) \ $(SERF_FLAG) \ @@ -1430,10 +1409,16 @@ svn-check-prepare-ramdisk: mkdir -p "$(RAMDISK)/tmp"; \ fi +ifndef NEON_FLAG +svn-check-neon: + @echo Neon is not supported by this build of Subversion, skipping tests + @true +else svn-check-neon: $(HTTPD_CHECK_CONF) $(SVN_OBJDIR)/.compiled $(SVN_OBJDIR)/.bindings-compiled svn-check-prepare-ramdisk $(HTTPD_START_CMD) $(call do_check,BASE_URL=http://localhost:$(HTTPD_CHECK_PORT) HTTP_LIBRARY=neon) $(HTTPD_STOP_CMD) +endif svn-check-serf: $(HTTPD_CHECK_CONF) $(SVN_OBJDIR)/.compiled $(SVN_OBJDIR)/.bindings-compiled svn-check-prepare-ramdisk $(HTTPD_START_CMD) @@ -1485,7 +1470,7 @@ svn-check-javahl: -if [ $(ENABLE_JAVA_BINDINGS) = yes ]; then \ (cd $(svn_builddir) && \ env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \ - make check-javahl 2>&1) | \ + make check-all-javahl 2>&1) | \ tee $(svn_builddir)/tests.log.bindings.javahl; \ fi Modified: subversion/branches/javahl-ra/tools/dev/windows-build/Makefile URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/windows-build/Makefile?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/tools/dev/windows-build/Makefile (original) +++ subversion/branches/javahl-ra/tools/dev/windows-build/Makefile Thu Jun 21 05:54:42 2012 @@ -31,7 +31,7 @@ INSTALLDIR=E:\svn EXPATVER=2.0.0 HTTPDVER=2.2.13 -NEONVER=0.28.2 +SERFVER=1.1.0 OPENSSLVER=0.9.8k SQLITEVER=3.6.3 ZLIBVER=1.2.3 @@ -40,7 +40,6 @@ ZLIBVER=1.2.3 PATCHESDIR=$(HOME)\mydiffs\svn OPENSSLDIR=$(SOURCESDIR)\openssl-$(OPENSSLVER) EXPATDIR=$(SOURCESDIR)\expat-$(EXPATVER) -NEONDIR=$(SOURCESDIR)\neon-$(NEONVER) HTTPDDIR=$(SOURCESDIR)\httpd-$(HTTPDVER) #APRDIR=$(SOURCESDIR)\apr #APRUTILDIR=$(SOURCESDIR)\apr-util @@ -50,7 +49,7 @@ APRUTILDIR=$(HTTPDDIR)\srclib\apr-util APRICONVDIR=$(HTTPDDIR)\srclib\apr-iconv SQLITEDIR=$(SOURCESDIR)\sqlite-amalgamation ZLIBDIR=$(SOURCESDIR)\zlib-$(ZLIBVER) -SERFDIR=$(SOURCESDIR)\serf +SERFDIR=$(SOURCESDIR)\serf-$(SERFVER) all: @echo Available targets: newfiles versionstamp @@ -101,10 +100,10 @@ targetdir: TARGETDIRset # TODO: pass --with-apr-* if you don't have httpd; make --with-* args optional config: targetdir - python gen-make.py --$(CONFIG) --with-httpd=$(HTTPDDIR) --with-neon=$(NEONDIR) --with-serf=$(SERFDIR) --with-openssl=$(OPENSSLDIR) --with-sqlite=$(SQLITEDIR) --with-zlib=$(ZLIBDIR) $(ENABLE_ML) --vsnet-version=2008 -t vcproj 2>&1 | tee log.gen-make + python gen-make.py --$(CONFIG) --with-httpd=$(HTTPDDIR) --with-serf=$(SERFDIR) --with-openssl=$(OPENSSLDIR) --with-sqlite=$(SQLITEDIR) --with-zlib=$(ZLIBDIR) $(ENABLE_ML) --vsnet-version=2008 -t vcproj 2>&1 | tee log.gen-make # Visual Studio 2008 -libsvn_auth_gnome_keyring libsvn_auth_kwallet libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_neon libsvn_ra_serf libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc: targetdir +libsvn_auth_gnome_keyring libsvn_auth_kwallet libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc: targetdir $(MSBUILD) /t:Libraries\$@ $(MAKE) package svn svnadmin svndumpfilter svnlook svnmucc svnserve svnsync svnversion svnrdump entries-dump: targetdir Modified: subversion/branches/javahl-ra/win-tests.py URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/win-tests.py?rev=1352418&r1=1352417&r2=1352418&view=diff ============================================================================== --- subversion/branches/javahl-ra/win-tests.py (original) +++ subversion/branches/javahl-ra/win-tests.py Thu Jun 21 05:54:42 2012 @@ -147,7 +147,7 @@ svnserve_args = None run_httpd = None httpd_port = None httpd_service = None -http_library = 'neon' +http_library = 'serf' http_short_circuit = False advertise_httpv2 = True http_bulk_updates = True
