'svn commit: r1809560 - in /subversion/branches/1.9.x-r1808955: ./ subversion/tests/cmdline/davautoch'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1809560 - in /subversion/branches/1.9.x-r1808955: ./ subversion/tests/cmdline/davautoch
From:       brane () apache ! org
Date:       2017-09-24 21:00:12
Message-ID: 20170924210015.EDA8B3A01AB () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: brane
Date: Sun Sep 24 21:00:12 2017
New Revision: 1809560

URL: http://svn.apache.org/viewvc?rev=1809560&view=rev
Log:
On the On the 1.9.x-r1808955 backport branch: Cherry-pick r1809558 from trunk.

Modified:
    subversion/branches/1.9.x-r1808955/   (props changed)
    subversion/branches/1.9.x-r1808955/subversion/tests/cmdline/davautocheck.sh

Propchange: subversion/branches/1.9.x-r1808955/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 24 21:00:12 2017
@@ -107,4 +107,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,166 \
3286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706,1 \
663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191 \
,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,16645 \
20-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,166 \
4653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1 \
665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845 \
,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,16663 \
79,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,166 \
7233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1 \
667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,166
  9945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295 \
,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,16730 \
65,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-167 \
3692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1 \
674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627 \
,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,16766 \
65,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,167 \
8734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1 \
679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495 \
,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,16832 \
90,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,
  1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687 \
776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,16 \
91924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135, \
1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,169568 \
1,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697 \
845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,17 \
01064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736, \
1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-170223 \
9,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702 \
478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,17 \
03544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,17063
  23-1706324,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1 \
709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507 \
,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,17171 \
54,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,172 \
0643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1 \
724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826 \
,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,17410 \
71-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,174 \
8514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1 \
758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334 \
,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,17
  69152,1769456,1769973,1770677,1774109,1776742,1776783,1776788,1777103,1779948,178150 \
7,1781655,1783214,1783704,1785053,1785734,1785737-1785738,1785754,1786445-1786447,1786 \
515,1794611,1796158,1796420,1796720,1800619,1802080,1802316,1804691-1804692,1804695,1804714,1808955-1808956
 +/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663253,16 \
63286,1663338,1663347,1663355,1663374,1663450,1663500,1663530,1663671,1663697,1663706, \
1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,166419 \
1,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664 \
520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,16 \
64653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997, \
1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,166584 \
5,1665850,1665852,1665873,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666 \
379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,16 \
67233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699- \
1667700,1667715,1667738,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1668625,1669743,1669746,1669749,166
  9945,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671164,1671388,1672295 \
,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,16730 \
65,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-167 \
3692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1 \
674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627 \
,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,16766 \
65,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,167 \
8734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1 \
679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495 \
,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683266-1683267,16832 \
90,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,
  1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,1687389,1687769,1687 \
776,1687812,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,16 \
91924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135, \
1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,169568 \
1,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697 \
845,1697914,1697967,1698106,1698312,1700130,1700215,1700219-1700220,1700740,1700951,17 \
01064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736, \
1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-170223 \
9,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702 \
478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703470,1703475-1703477,17 \
03544,1703581,1703675,1703688-1703689,1703740,1704292,1704573,1704821,1704847,1705060,1705062,1705064,1705088,1705328,1705843,1706241,17063
  23-1706324,1706375,1706428,1706432,1706437,1706783,1706983,1706999,1708699,1709388-1 \
709389,1709553,1709562,1710104,1710167,1710215,1710290,1710558,1711250,1711346,1711507 \
,1711510,1714314,1714358,1714790,1715224,1715232,1715262,1715777,1715793,1716808,17171 \
54,1717869,1717871,1717873-1717875,1717878,1718167,1718267,1718269,1718484,1720015,172 \
0643,1721174-1721175,1721285,1721488,1721648,1722164,1722860-1722861,1722879,1722887,1 \
724448,1725180,1728308,1728387,1729060,1729519,1730856,1734106,1734926,1735179,1735826 \
,1736432,1737122,1738259,1738659,1738828,1739278,1739280,1740252,1740254,1740316,17410 \
71-1741073,1741078,1741096,1741200,1741206,1741401,1745515,1746053,1746277,1746364,174 \
8514,1754190,1756266,1757529,1757532,1757539,1758128-1758130,1758153,1758202,1758204,1 \
758207,1758209,1758224,1758269,1758385,1758781,1759116-1759124,1759686,1760570,1761334 \
,1761653,1761755,1762338-1762339,1763934,1764034,1764676,1764851,1766240,1766323,1766327,1766352,1766590,1766699,1766704,1766711,1767768,17
  69152,1769456,1769973,1770677,1774109,1776742,1776783,1776788,1777103,1779948,178150 \
7,1781655,1783214,1783704,1785053,1785734,1785737-1785738,1785754,1786445-1786447,1786 \
515,1794611,1796158,1796420,1796720,1800619,1802080,1802316,1804691-1804692,1804695,1804714,1808955-1808956,1809558


Modified: subversion/branches/1.9.x-r1808955/subversion/tests/cmdline/davautocheck.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1808955/subversion/tests/cmdline/davautocheck.sh?rev=1809560&r1=1809559&r2=1809560&view=diff
 ==============================================================================
--- subversion/branches/1.9.x-r1808955/subversion/tests/cmdline/davautocheck.sh \
                (original)
+++ subversion/branches/1.9.x-r1808955/subversion/tests/cmdline/davautocheck.sh Sun \
Sep 24 21:00:12 2017 @@ -703,6 +703,15 @@ RedirectMatch permanent ^/svn-test-work/
 RedirectMatch           ^/svn-test-work/repositories/REDIRECT-TEMP-(.*)\$ \
/svn-test-work/repositories/\$1  __EOF__
 
+
+# Our configure script extracts the HTTPD version from
+# headers. However, that may not be the same as the runtime version;
+# an example of this discrepancy occurs on OSX 1.9.5, where the
+# headers report 2.2.26 but the server reports 2.2.29. Since our tests
+# use the version to interpret test case results, use the actual
+# runtime version here to avoid spurious test failures.
+HTTPD_VERSION=$("$HTTPD" -V | grep '^Server version:' | sed \
's|^.*/\([0-9]*\.[0-9]*\.[0-9]*\).*$|\1|') +
 START="$HTTPD -f $HTTPD_CFG"
 printf \
 '#!/bin/sh
@@ -726,7 +735,7 @@ $START -t \
 $START &
 sleep 2
 
-say "HTTPD started and listening on '$BASE_URL'..."
+say "HTTPD $HTTPD_VERSION started and listening on '$BASE_URL'..."
 #query "Ready" "y"
 
 # Perform a trivial validation of our httpd configuration by
@@ -787,14 +796,6 @@ else
     || fail "Subversion client couldn't find and/or load ra_dav library \
'$HTTP_LIBRARY'"  fi
 
-# Our configure script extracts the HTTPD version from
-# headers. However, that may not be the same as the runtime version;
-# an example of this discrepancy occurs on OSX 1.9.5, where the
-# headers report 2.2.26 but the server reports 2.2.29. Since our tests
-# use the version to interpret test case results, use the actual
-# runtime version here to avoid spurious test failures.
-HTTPD_VERSION="$($APXS -q HTTPD_VERSION)"
-
 if [ $# = 0 ]; then
   $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" "HTTPD_VERSION=$HTTPD_VERSION" \
$SSL_MAKE_VAR  r=$?


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic