From 6f331e068eac3d27ec97b3ad66220d10aa949af7 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 7 Mar 2019 10:09:33 +1100 Subject: [PATCH 1/2] remove dependancy on libxml (cherry picked from commit a9c47414b356742e3d7a758f18e90fee1a2c95fc) --- bin/tests/system/statschannel/tests.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh index a16a25b46e..74650e6785 100644 --- a/bin/tests/system/statschannel/tests.sh +++ b/bin/tests/system/statschannel/tests.sh @@ -181,13 +181,15 @@ echo_i "checking consistency between regular and compressed output ($n)" if [ "$HAVEXMLSTATS" ]; then URL=http://10.53.0.2:${EXTRAPORT1}/xml/v3/server + filter_str='s#.*##g' else URL=http://10.53.0.2:${EXTRAPORT1}/json/v1/server + filter_str='s#"current-time.*",##g' fi $CURL -D regular.headers $URL 2>/dev/null | \ - sed -e "s#.*##g" > regular.out + sed -e "$filter_str" > regular.out $CURL -D compressed.headers --compressed $URL 2>/dev/null | \ - sed -e "s#.*##g" > compressed.out + sed -e "$filter_str" > compressed.out $DIFF regular.out compressed.out >/dev/null || ret=1 if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` From c2495053f2bdeb8e00c71741cb68f97d52a4a749 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 7 Mar 2019 10:25:15 +1100 Subject: [PATCH 2/2] add CHANGES (cherry picked from commit 5bc06a0a11ebe0264679fa81b5543192dd0a17a6) --- CHANGES | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 7f30a28b66..99c9da3704 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5176. [tests] Remove a dependency on libxml in statschannel system + test. [GL #926] + 5172. [bug] nsupdate now honors the operating system's preferred ephemeral port range. [GL #905] @@ -142,8 +145,8 @@ 5092. [bug] Address memory leak on SIGTERM in nsupdate when using GSS-TSIG. [GL #558] -5090. [bug] dig and mdig failed to properly preparse dash value - pairs when value was a seperate argument and started +5090. [bug] dig and mdig failed to properly pre-parse dash value + pairs when value was a separate argument and started with a dash. [GL #584] 5088. [bug] dig/host/nslookup could crash when interrupted close to @@ -169,7 +172,7 @@ 5072. [bug] Add unit tests for isc_buffer_copyregion() and fix its behavior for auto-reallocated buffers. [GL #644] -5071. [bug] Comparision of NXT records was broken. [GL #631] +5071. [bug] Comparison of NXT records was broken. [GL #631] 5070. [bug] Record types which support a empty rdata field were not handling the empty rdata field case. [GL #638] @@ -179,7 +182,7 @@ 5065. [bug] Only set IPV6_USE_MIN_MTU on IPv6. [GL #553] -5064. [test] Initalize TZ environment variable before calling +5064. [test] Initialize TZ environment variable before calling dns_test_begin in dnstap_test. [GL #624] 5061. [protocol] Add support for EID and NIMLOC. [GL #626]