You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/30 19:02:03 UTC
svn commit: r1537216 - in /subversion/branches/1.8.x-r1537147: ./
subversion/tests/ subversion/tests/libsvn_subr/
Author: rhuijben
Date: Wed Oct 30 18:02:02 2013
New Revision: 1537216
URL: http://svn.apache.org/r1537216
Log:
Merge r1537147,1537190,1537193 from trunk excluding the config-test.c changes
Added:
subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/zlib.deflated
- copied unchanged from r1537193, subversion/trunk/subversion/tests/libsvn_subr/zlib.deflated
Modified:
subversion/branches/1.8.x-r1537147/ (props changed)
subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/checksum-test.c
subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/config-test.c (props changed)
subversion/branches/1.8.x-r1537147/subversion/tests/svn_test.h
subversion/branches/1.8.x-r1537147/subversion/tests/svn_test_main.c
Propchange: subversion/branches/1.8.x-r1537147/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1537147,1537190,1537193
Modified: subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/checksum-test.c?rev=1537216&r1=1537215&r2=1537216&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/checksum-test.c Wed Oct 30 18:02:02 2013
@@ -23,7 +23,10 @@
#include <apr_pools.h>
+#include <zlib.h>
+
#include "svn_error.h"
+#include "svn_io.h"
#include "private/svn_pseudo_md5.h"
#include "../svn_test.h"
@@ -155,6 +158,91 @@ zero_match(apr_pool_t *pool)
return SVN_NO_ERROR;
}
+static svn_error_t *
+zlib_expansion_test(const svn_test_opts_t *opts,
+ apr_pool_t *pool)
+{
+ const char *data_path;
+ svn_stringbuf_t *deflated;
+ Byte dst_buffer[256 * 1024];
+ Byte *src_buffer;
+ apr_size_t sz;
+
+ data_path = svn_dirent_join(opts->srcdir, "zlib.deflated", pool);
+
+ SVN_ERR(svn_stringbuf_from_file2(&deflated, data_path, pool));
+ src_buffer = (Byte*)deflated->data;
+
+ z_stream stream;
+ memset(&stream, 0, sizeof(stream));
+ inflateInit2(&stream, -15 /* DEFLATE_WINDOW_SIZE */);
+
+ /* Try to decompress the same data with different blocksizes */
+ for (sz = 1; sz < 256; sz++)
+ {
+ z_stream stream;
+ memset(&stream, 0, sizeof(stream));
+ inflateInit2(&stream, -15 /* DEFLATE_WINDOW_SIZE */);
+
+ stream.avail_in = sz;
+ stream.next_in = src_buffer;
+ stream.avail_out = sizeof(dst_buffer);
+ stream.next_out = dst_buffer;
+
+ do
+ {
+ int zr = inflate(&stream, Z_NO_FLUSH);
+
+ if (zr != Z_OK && zr != Z_STREAM_END)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Failure decompressing with blocksize %d", (int)sz);
+ }
+ stream.avail_in += sz;
+ } while (stream.next_in + stream.avail_in < src_buffer + deflated->len);
+
+ stream.avail_in = (src_buffer + deflated->len) - stream.next_in;
+
+ {
+ int zr = inflate(&stream, Z_NO_FLUSH);
+
+ if (zr != Z_STREAM_END)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Final flush failed with blocksize %d", (int)sz);
+ }
+
+ zr = inflateEnd(&stream);
+
+ if (zr != Z_OK)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "End of stream handling failed with blocksize %d",
+ (int)sz);
+ }
+ }
+
+ {
+ apr_uint32_t crc = crc32(0, dst_buffer, stream.total_out);
+
+ if (stream.total_out != 242014 || crc != 0x8f03d934)
+ {
+ return svn_error_createf(
+ SVN_ERR_TEST_FAILED, NULL,
+ "Decompressed data doesn't match expected size or crc with "
+ "blocksize %d: Found crc32=0x%08x, size=%d.\n"
+ "Verify your ZLib installation, as this should never happen",
+ (int)sz, (unsigned)crc, (int)stream.total_out);
+ }
+ }
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* An array of all test functions */
struct svn_test_descriptor_t test_funcs[] =
{
@@ -167,5 +255,7 @@ struct svn_test_descriptor_t test_funcs[
"pseudo-md5 compatibility"),
SVN_TEST_PASS2(zero_match,
"zero checksum matching"),
+ SVN_TEST_OPTS_PASS(zlib_expansion_test,
+ "zlib expansion test (zlib regression)"),
SVN_TEST_NULL
};
Propchange: subversion/branches/1.8.x-r1537147/subversion/tests/libsvn_subr/config-test.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Oct 30 18:02:02 2013
@@ -0,0 +1,91 @@
+/subversion/branches/1.5.x-r30215/subversion/tests/libsvn_subr/config-test.c:870312
+/subversion/branches/1.7.x-fs-verify/subversion/tests/libsvn_subr/config-test.c:1146708,1161180
+/subversion/branches/1.8.x-busted-proxy/subversion/tests/libsvn_subr/config-test.c:1499222-1502434
+/subversion/branches/1.8.x-issue4400/subversion/tests/libsvn_subr/config-test.c:1507591-1512557
+/subversion/branches/1.8.x-libsvnjavahl-version/subversion/tests/libsvn_subr/config-test.c:1483910-1485054
+/subversion/branches/1.8.x-r1477876/subversion/tests/libsvn_subr/config-test.c:1477981-1487716
+/subversion/branches/1.8.x-r1481625/subversion/tests/libsvn_subr/config-test.c:1481637-1482135
+/subversion/branches/1.8.x-r1495063/subversion/tests/libsvn_subr/config-test.c:1495804-1501074
+/subversion/branches/1.8.x-r1497310-partial/subversion/tests/libsvn_subr/config-test.c:1497500-1501063
+/subversion/branches/1.8.x-r1502267/subversion/tests/libsvn_subr/config-test.c:1502268-1515998
+/subversion/branches/1.8.x-r1507044/subversion/tests/libsvn_subr/config-test.c:1507282-1511571
+/subversion/branches/1.8.x-r1513879/subversion/tests/libsvn_subr/config-test.c:1514699-1516021
+/subversion/branches/1.8.x-r175-daemonize/subversion/tests/libsvn_subr/config-test.c:1515866-1516020
+/subversion/branches/1.8.x-serf-1.3+-windows/subversion/tests/libsvn_subr/config-test.c:1517122-1533873
+/subversion/branches/1.8.x-svn_fs_info-removal/subversion/tests/libsvn_subr/config-test.c:1467420-1468159
+/subversion/branches/1.8.x-svnsync-serf-memory/subversion/tests/libsvn_subr/config-test.c:1515248-1515701
+/subversion/branches/1.8.x-synvsync-serf-memory/subversion/tests/libsvn_subr/config-test.c:1515247
+/subversion/branches/1.8.x-tristate-chunked-request/subversion/tests/libsvn_subr/config-test.c:1502435-1503894
+/subversion/branches/10Gb/subversion/tests/libsvn_subr/config-test.c:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
+/subversion/branches/atomic-revprop/subversion/tests/libsvn_subr/config-test.c:965046-1000689
+/subversion/branches/auto-props-sdc/subversion/tests/libsvn_subr/config-test.c:1384106-1401643
+/subversion/branches/bdb-reverse-deltas/subversion/tests/libsvn_subr/config-test.c:872050-872529
+/subversion/branches/diff-callbacks3/subversion/tests/libsvn_subr/config-test.c:870059-870761
+/subversion/branches/diff-optimizations/subversion/tests/libsvn_subr/config-test.c:1031270-1037352
+/subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/config-test.c:1037353-1067789
+/subversion/branches/dont-save-plaintext-passwords-by-default/subversion/tests/libsvn_subr/config-test.c:870728-871118
+/subversion/branches/double-delete/subversion/tests/libsvn_subr/config-test.c:870511-872970
+/subversion/branches/ev2-export/subversion/tests/libsvn_subr/config-test.c:1325914,1332738,1413107
+/subversion/branches/explore-wc/subversion/tests/libsvn_subr/config-test.c:875486,875493,875497,875507,875511,875514,875559,875580-875581,875584,875587,875611,875627,875647,875667-875668,875711-875712,875733-875734,875736,875744-875748,875751,875758,875782,875795-875796,875830,875836,875838,875842,875852,875855,875864,875870,875873,875880,875885-875888,875890,875897-875898,875905,875907-875909,875935,875943-875944,875946,875979,875982-875983,875985-875986,875990,875997
+/subversion/branches/file-externals/subversion/tests/libsvn_subr/config-test.c:871779-873302
+/subversion/branches/fs-rep-sharing/subversion/tests/libsvn_subr/config-test.c:869036-873803
+/subversion/branches/fsfs-pack/subversion/tests/libsvn_subr/config-test.c:873717-874575
+/subversion/branches/gnome-keyring/subversion/tests/libsvn_subr/config-test.c:870558-871410
+/subversion/branches/gpg-agent-password-store/subversion/tests/libsvn_subr/config-test.c:1005036-1150766
+/subversion/branches/http-protocol-v2/subversion/tests/libsvn_subr/config-test.c:874395-876041
+/subversion/branches/in-memory-cache/subversion/tests/libsvn_subr/config-test.c:869829-871452
+/subversion/branches/in-repo-authz/subversion/tests/libsvn_subr/config-test.c:1414342-1424779
+/subversion/branches/inheritable-props/subversion/tests/libsvn_subr/config-test.c:1297080-1395089
+/subversion/branches/integrate-cache-item-serialization/subversion/tests/libsvn_subr/config-test.c:1068724-1068739
+/subversion/branches/integrate-cache-membuffer/subversion/tests/libsvn_subr/config-test.c:998649-998852
+/subversion/branches/integrate-compression-level/subversion/tests/libsvn_subr/config-test.c:1068651-1072287
+/subversion/branches/integrate-io-improvements/subversion/tests/libsvn_subr/config-test.c:1068684-1072297
+/subversion/branches/integrate-is-cachable/subversion/tests/libsvn_subr/config-test.c:1072568-1074082
+/subversion/branches/integrate-partial-getter/subversion/tests/libsvn_subr/config-test.c:1072558-1076552
+/subversion/branches/integrate-readline-speedup/subversion/tests/libsvn_subr/config-test.c:1072553-1072555
+/subversion/branches/integrate-stream-api-extensions/subversion/tests/libsvn_subr/config-test.c:1068695-1072516
+/subversion/branches/integrate-string-improvements/subversion/tests/libsvn_subr/config-test.c:1068251-1190617
+/subversion/branches/integrate-txdelta-caching/subversion/tests/libsvn_subr/config-test.c:1072541-1078213
+/subversion/branches/issue-2779-dev/subversion/tests/libsvn_subr/config-test.c:965496-984198
+/subversion/branches/issue-2843-dev/subversion/tests/libsvn_subr/config-test.c:871432-874179
+/subversion/branches/issue-3000/subversion/tests/libsvn_subr/config-test.c:871713,871716-871719,871721-871726,871728,871734
+/subversion/branches/issue-3067-deleted-subtrees/subversion/tests/libsvn_subr/config-test.c:873375-874084
+/subversion/branches/issue-3148-dev/subversion/tests/libsvn_subr/config-test.c:875193-875204
+/subversion/branches/issue-3220-dev/subversion/tests/libsvn_subr/config-test.c:872210-872226
+/subversion/branches/issue-3242-dev/subversion/tests/libsvn_subr/config-test.c:879653-896436
+/subversion/branches/issue-3334-dirs/subversion/tests/libsvn_subr/config-test.c:875156-875867
+/subversion/branches/issue-3975/subversion/tests/libsvn_subr/config-test.c:1152931-1160746
+/subversion/branches/issue-4116-dev/subversion/tests/libsvn_subr/config-test.c:1424719-1425040
+/subversion/branches/issue-4194-dev/subversion/tests/libsvn_subr/config-test.c:1410507-1414880
+/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/config-test.c:1342682,1344977
+/subversion/branches/kwallet/subversion/tests/libsvn_subr/config-test.c:870785-871314
+/subversion/branches/log-g-performance/subversion/tests/libsvn_subr/config-test.c:870941-871032
+/subversion/branches/merge-skips-obstructions/subversion/tests/libsvn_subr/config-test.c:874525-874615
+/subversion/branches/multi-layer-moves/subversion/tests/libsvn_subr/config-test.c:1239019-1300930
+/subversion/branches/nfc-nfd-aware-client/subversion/tests/libsvn_subr/config-test.c:870276,870376
+/subversion/branches/node_pool/subversion/tests/libsvn_subr/config-test.c:1304828-1305388
+/subversion/branches/performance/subversion/tests/libsvn_subr/config-test.c:979193,980118,981087,981090,981189,981194,981287,981684,981827,982043,982355,983398,983406,983430,983474,983488,983490,983760,983764,983766,983770,984927,984973,984984,985014,985037,985046,985472,985477,985482,985487-985488,985493,985497,985500,985514,985601,985603,985606,985669,985673,985695,985697,986453,986465,986485,986491-986492,986517,986521,986605,986608,986817,986832,987865,987868-987869,987872,987886-987888,987893,988319,988898,990330,990533,990535-990537,990541,990568,990572,990574-990575,990600,990759,992899,992904,992911,993127,993141,994956,995478,995507,995603,998012,998858,999098,1001413,1001417,1004291,1022668,1022670,1022676,1022715,1022719,1025660,1025672,1027193,1027203,1027206,1027214,1027227,1028077,1028092,1028094,1028104,1028107,1028111,1028354,1029038,1029042-1029043,1029054-1029055,1029062-1029063,1029078,1029080,1029090,1029092-1029093,1029111,1029151,1029158,1029229-1029230,1029232
,1029335-1029336,1029339-1029340,1029342,1029344,1030763,1030827,1031203,1031235,1032285,1032333,1033040,1033057,1033294,1035869,1035882,1039511,1043705,1053735,1056015,1066452,1067683,1067697-1078365
+/subversion/branches/py-tests-as-modules/subversion/tests/libsvn_subr/config-test.c:956579-1033052
+/subversion/branches/ra_serf-digest-authn/subversion/tests/libsvn_subr/config-test.c:875693-876404
+/subversion/branches/reintegrate-improvements/subversion/tests/libsvn_subr/config-test.c:873853-874164
+/subversion/branches/revprop-cache/subversion/tests/libsvn_subr/config-test.c:1298521-1326293
+/subversion/branches/revprop-packing/subversion/tests/libsvn_subr/config-test.c:1143907,1143971,1143997,1144017,1144499,1144568,1146145
+/subversion/branches/subtree-mergeinfo/subversion/tests/libsvn_subr/config-test.c:876734-878766
+/subversion/branches/svn-mergeinfo-enhancements/subversion/tests/libsvn_subr/config-test.c:870119-870195,870197-870288
+/subversion/branches/svn-patch-improvements/subversion/tests/libsvn_subr/config-test.c:918519-934609
+/subversion/branches/svn_mutex/subversion/tests/libsvn_subr/config-test.c:1141683-1182099
+/subversion/branches/svnpatch-diff/subversion/tests/libsvn_subr/config-test.c:865738-876477
+/subversion/branches/svnraisetc/subversion/tests/libsvn_subr/config-test.c:874709-875149
+/subversion/branches/svnserve-logging/subversion/tests/libsvn_subr/config-test.c:869828-870893
+/subversion/branches/tc-issue-3334/subversion/tests/libsvn_subr/config-test.c:874697-874773
+/subversion/branches/tc-merge-notify/subversion/tests/libsvn_subr/config-test.c:874017-874062
+/subversion/branches/tc-resolve/subversion/tests/libsvn_subr/config-test.c:874191-874239
+/subversion/branches/tc_url_rev/subversion/tests/libsvn_subr/config-test.c:874351-874483
+/subversion/branches/tree-conflicts/subversion/tests/libsvn_subr/config-test.c:868291-873154
+/subversion/branches/tree-conflicts-notify/subversion/tests/libsvn_subr/config-test.c:873926-874008
+/subversion/branches/tristate-chunked-request/subversion/tests/libsvn_subr/config-test.c:1502401,1502673
+/subversion/branches/tweak-build-take-two/subversion/tests/libsvn_subr/config-test.c:1424288-1425049,1425051-1425613
+/subversion/branches/uris-as-urls/subversion/tests/libsvn_subr/config-test.c:1060426-1064427
+/subversion/branches/verify-at-commit/subversion/tests/libsvn_subr/config-test.c:1462039-1462408
+/subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/config-test.c:1407642
+/subversion/trunk/subversion/tests/libsvn_subr/config-test.c:1467440,1467450,1467481,1467587,1467597,1467668,1467675,1467803,1467807,1468151,1468347,1468395,1468439,1468487,1468565-1468566,1468980,1469248,1469363,1469478,1469489,1469512-1469513,1469550,1469556,1469645,1469674,1469862,1469866,1469871,1469994,1470031,1470037,1470238,1470246,1470248,1470537,1470738,1470781,1470898,1470904,1470908,1470913,1470936,1470993-1470994,1471028-1471029,1471107,1471153,1471302,1471443,1471490,1471744,1475704,1475724,1475772,1475963,1476092,1476155,1476181,1476193,1476254,1476359,1476366,1476607,1477294,1477359,1477729-1477730,1477876,1477891,1478001,1478220-1478221,1478465,1478897,1478951,1478987,1478998,1479320-1479321,1479323,1479326,1479329,1479540,1479563,1479605,1479896,1480054,1480077,1480080,1480082,1480119,1480149,1480344,1480412,1480442,1480616,1480641-1480642,1480664,1480669,1480723,1480738,1480765,1481010,1481594,1481596,1481625,1481627-1481628,1481631-1481632,1481772,1481800,1481813,
1481847,1481944,1481981,1482282,1482327,1482338,1482350,1482354,1482436,1482479,1482524,1482528,1482536,1482554,1482558,1482592,1482724,1482759,1482779,1482829,1482969-1482970,1482973,1483015,1483077,1483101,1483116,1483125,1483391,1483397,1483555,1483557,1483575,1483580,1483781,1483927,1483939,1483947,1483964-1483965,1483968,1483972,1483975,1483977,1483984,1484006,1484016-1484017,1484023,1484755,1485018,1485127,1485350,1485413,1485427,1485447,1485449,1485497,1485501,1485650,1486072,1486457,1486572,1486809,1486915,1486931,1487083,1487094,1488183,1488267,1488294,1488425,1488639,1488693,1488878,1489114,1489116-1489117,1489203,1489339,1489935,1490045,1490326,1490679,1490684,1490721,1491432,1491499,1491707,1491739,1491755-1491756,1491762,1491770,1491816,1491868,1492005,1492020,1492145,1492148,1492152,1492164,1492264,1492295,1493424,1493475,1493703,1493720,1493951,1494089,1494171,1494223,1494287,1494298,1494318,1494342,1494657,1494913,1494967,1495063,1495104,1495204,1495209,1495214,14952
56,1495329,1495428,1495432,1495446,1495597,1495805,1495850,1495978,1496007,1496110-1496111,1496132,1496151,1496470,1496938,1496957,1497002,1497318-1497319,1497551,1497804,1497975,1497980,1498012,1498136,1498449,1498455-1498456,1498483-1498484,1498486,1498550,1498564,1498851,1498885,1498997,1499034,1499044,1499064,1499095-1499096,1499100,1499403,1499423,1499438,1499447,1499460,1499483,1499492,1499496,1499498,1499595,1499727,1500074,1500175,1500226,1500680,1500695,1500762,1500799,1500801-1500802,1500904,1500928,1501199,1501207,1501656,1501702,1502097,1502267,1502577,1502777,1502811,1502901,1502909,1502952,1503009-1503010,1503058,1503061,1503211,1503318,1503528,1503884,1504192,1504505,1506040-1506041,1506047,1506058,1506966,1507044,1507382,1507567,1507589,1507889,1507891,1508438,1509186,1509196,1511057,1511272,1511353,1511603,1512195,1512300-1512301,1512432,1512471-1512472,1513119,1513122,1513156,1513463,1513472,1513874,1513879-1513880,1513943,1514295,1514315,1514318,1514356,1514628,15
14763,1514785,1514804,1515119,1515141,1515201,1515225,1515237,1515343,1515366,1515516,1515534,1515721,1515992,1515997,1516023-1516024,1516049,1516051-1516053,1516071,1516271,1516429,1516556,1516565,1516567,1516806,1518184,1519615,1519617,1519733,1519955,1520065,1520529,1520532,1520539,1520745,1522892,1523666,1524869,1526439,1526655,1527103,1527105,1530763,1530768,1530872,1530922,1530967,1531002,1531004,1531938,1532023,1532098,1534102,1534158,1534713,1534737,1534860
Modified: subversion/branches/1.8.x-r1537147/subversion/tests/svn_test.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1537147/subversion/tests/svn_test.h?rev=1537216&r1=1537215&r2=1537216&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1537147/subversion/tests/svn_test.h (original)
+++ subversion/branches/1.8.x-r1537147/subversion/tests/svn_test.h Wed Oct 30 18:02:02 2013
@@ -103,6 +103,8 @@ typedef struct svn_test_opts_t
const char *fs_type;
/* Config file. */
const char *config_file;
+ /* Source dir. */
+ const char *srcdir;
/* Minor version to use for servers and FS backends, or zero to use
the current latest version. */
int server_minor_version;
Modified: subversion/branches/1.8.x-r1537147/subversion/tests/svn_test_main.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1537147/subversion/tests/svn_test_main.c?rev=1537216&r1=1537215&r2=1537216&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1537147/subversion/tests/svn_test_main.c (original)
+++ subversion/branches/1.8.x-r1537147/subversion/tests/svn_test_main.c Wed Oct 30 18:02:02 2013
@@ -475,6 +475,10 @@ main(int argc, const char *argv[])
case fstype_opt:
opts.fs_type = apr_pstrdup(pool, opt_arg);
break;
+ case srcdir_opt:
+ SVN_INT_ERR(svn_utf_cstring_to_utf8(&opts.srcdir, opt_arg, pool));
+ opts.srcdir = svn_dirent_internal_style(opts.srcdir, pool);
+ break;
case list_opt:
list_mode = TRUE;
break;