From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arturo Borrero Gonzalez Subject: [libnftables PATCH] tests: xml: delete comments Date: Wed, 15 Jan 2014 12:12:18 +0100 Message-ID: <20140115111218.25584.60794.stgit@nfdev.cica.es> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Return-path: Received: from smtp3.cica.es ([150.214.5.190]:60880 "EHLO smtp.cica.es" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750998AbaAOLMa (ORCPT ); Wed, 15 Jan 2014 06:12:30 -0500 Sender: netfilter-devel-owner@vger.kernel.org List-ID: In libmxml > 2.6, comments are not ignored when building the XML tree, so these comments produce errors and test fail. Delete the comment lines, so parsing test pass with libmxml 2.7 and 2.8. By now, this is the only issue I found when working with libmxml > 2.6. Signed-off-by: Arturo Borrero Gonzalez --- tests/xmlfiles/20-rule-bitwise.xml | 1 - tests/xmlfiles/22-rule-cmp.xml | 1 - tests/xmlfiles/23-rule-counter.xml | 1 - tests/xmlfiles/24-rule-ct.xml | 1 - tests/xmlfiles/26-rule-immediate.xml | 1 - tests/xmlfiles/28-rule-log.xml | 1 - tests/xmlfiles/29-rule-lookup.xml | 1 - tests/xmlfiles/31-rule-meta.xml | 1 - tests/xmlfiles/34-rule-payload.xml | 1 - tests/xmlfiles/36-rule-real.xml | 1 - tests/xmlfiles/37-rule-real.xml | 1 - tests/xmlfiles/38-rule-real.xml | 1 - tests/xmlfiles/39-rule-real.xml | 1 - tests/xmlfiles/40-rule-real.xml | 1 - tests/xmlfiles/41-rule-real.xml | 1 - tests/xmlfiles/42-rule-real.xml | 1 - tests/xmlfiles/43-rule-real.xml | 1 - tests/xmlfiles/44-rule-real.xml | 1 - tests/xmlfiles/45-rule-real.xml | 1 - tests/xmlfiles/46-rule-real.xml | 1 - tests/xmlfiles/47-rule-real.xml | 1 - tests/xmlfiles/48-rule-real.xml | 1 - tests/xmlfiles/49-rule-real.xml | 1 - tests/xmlfiles/50-rule-real.xml | 1 - tests/xmlfiles/51-rule-real.xml | 1 - tests/xmlfiles/52-rule-real.xml | 1 - tests/xmlfiles/53-rule-real.xml | 1 - tests/xmlfiles/54-rule-real.xml | 1 - tests/xmlfiles/55-rule-real.xml | 1 - tests/xmlfiles/56-rule-real.xml | 1 - tests/xmlfiles/57-rule-real.xml | 1 - tests/xmlfiles/58-rule-real.xml | 1 - tests/xmlfiles/59-rule-real.xml | 1 - tests/xmlfiles/60-rule-real.xml | 1 - tests/xmlfiles/61-rule-real.xml | 1 - tests/xmlfiles/62-rule-real.xml | 1 - tests/xmlfiles/63-rule-real.xml | 1 - tests/xmlfiles/64-rule-real.xml | 1 - tests/xmlfiles/65-rule-real.xml | 1 - tests/xmlfiles/66-rule-real.xml | 1 - tests/xmlfiles/67-rule-real.xml | 1 - tests/xmlfiles/68-rule-real.xml | 1 - tests/xmlfiles/69-rule-real.xml | 1 - tests/xmlfiles/70-rule-real.xml | 1 - tests/xmlfiles/71-rule-real.xml | 1 - tests/xmlfiles/72-rule-real.xml | 1 - tests/xmlfiles/73-set.xml | 1 - tests/xmlfiles/74-set.xml | 1 - 48 files changed, 48 deletions(-) diff --git a/tests/xmlfiles/20-rule-bitwise.xml b/tests/xmlfiles/20-rule-bitwise.xml index 8562863..756b22c 100644 --- a/tests/xmlfiles/20-rule-bitwise.xml +++ b/tests/xmlfiles/20-rule-bitwise.xml @@ -1,2 +1 @@ ipfilter
INPUT10011440x0000000a40x00000000
- diff --git a/tests/xmlfiles/22-rule-cmp.xml b/tests/xmlfiles/22-rule-cmp.xml index ea8ea30..308fb9f 100644 --- a/tests/xmlfiles/22-rule-cmp.xml +++ b/tests/xmlfiles/22-rule-cmp.xml @@ -1,2 +1 @@ ip6filter
test361eq160x000000000x6e6f62000x2e3031640x00393331
- diff --git a/tests/xmlfiles/23-rule-counter.xml b/tests/xmlfiles/23-rule-counter.xml index 82700de..6299e84 100644 --- a/tests/xmlfiles/23-rule-counter.xml +++ b/tests/xmlfiles/23-rule-counter.xml @@ -1,2 +1 @@ ip6filter
test393177
- diff --git a/tests/xmlfiles/24-rule-ct.xml b/tests/xmlfiles/24-rule-ct.xml index e8e565d..b3f4ad8 100644 --- a/tests/xmlfiles/24-rule-ct.xml +++ b/tests/xmlfiles/24-rule-ct.xml @@ -1,2 +1 @@ ipfilter
INPUT1001state0
- diff --git a/tests/xmlfiles/26-rule-immediate.xml b/tests/xmlfiles/26-rule-immediate.xml index 4d10eb6..1258c8b 100644 --- a/tests/xmlfiles/26-rule-immediate.xml +++ b/tests/xmlfiles/26-rule-immediate.xml @@ -1,2 +1 @@ ipfilter
input320accept
- diff --git a/tests/xmlfiles/28-rule-log.xml b/tests/xmlfiles/28-rule-log.xml index f24f858..5865bd4 100644 --- a/tests/xmlfiles/28-rule-log.xml +++ b/tests/xmlfiles/28-rule-log.xml @@ -1,2 +1 @@ ip6filter
test96test_chain100
- diff --git a/tests/xmlfiles/29-rule-lookup.xml b/tests/xmlfiles/29-rule-lookup.xml index c77e95c..052b008 100644 --- a/tests/xmlfiles/29-rule-lookup.xml +++ b/tests/xmlfiles/29-rule-lookup.xml @@ -1,2 +1 @@ ip6filter
test37set010
- diff --git a/tests/xmlfiles/31-rule-meta.xml b/tests/xmlfiles/31-rule-meta.xml index 22498e7..a1c9e8c 100644 --- a/tests/xmlfiles/31-rule-meta.xml +++ b/tests/xmlfiles/31-rule-meta.xml @@ -1,2 +1 @@ ip6filter
test361iifname
- diff --git a/tests/xmlfiles/34-rule-payload.xml b/tests/xmlfiles/34-rule-payload.xml index 833e640..a6faca9 100644 --- a/tests/xmlfiles/34-rule-payload.xml +++ b/tests/xmlfiles/34-rule-payload.xml @@ -1,2 +1 @@ ip6filter
test34122transport
- diff --git a/tests/xmlfiles/36-rule-real.xml b/tests/xmlfiles/36-rule-real.xml index 17f1e5f..5c8e075 100644 --- a/tests/xmlfiles/36-rule-real.xml +++ b/tests/xmlfiles/36-rule-real.xml @@ -1,2 +1 @@ ipfilter
output221128network1eq80x0100a8c00x6400a8c000
- diff --git a/tests/xmlfiles/37-rule-real.xml b/tests/xmlfiles/37-rule-real.xml index dc45629..89b06b8 100644 --- a/tests/xmlfiles/37-rule-real.xml +++ b/tests/xmlfiles/37-rule-real.xml @@ -1,2 +1 @@ ipfilter
INPUT251iifname1eq160x000000000x000000000x650000000x00306874191network1eq10x00000006122transport1eq20x000016001state011440x0000000a40x000000001neq40x0000000000testprefix100
- diff --git a/tests/xmlfiles/38-rule-real.xml b/tests/xmlfiles/38-rule-real.xml index 6f41f0e..b8830b0 100644 --- a/tests/xmlfiles/38-rule-real.xml +++ b/tests/xmlfiles/38-rule-real.xml @@ -1,2 +1 @@ ipfilter
INPUT301164networkset310191network1eq10x00000006122transport1eq20x0000bb01000accept
- diff --git a/tests/xmlfiles/39-rule-real.xml b/tests/xmlfiles/39-rule-real.xml index c823c25..a307a2e 100644 --- a/tests/xmlfiles/39-rule-real.xml +++ b/tests/xmlfiles/39-rule-real.xml @@ -1,2 +1 @@ ip6filter
test311iifname1eq160x000000000x000000000x6f6200000x0030646e1oifname1eq160x000000000x620000000x31646e6f0x0037322e1816network1eq160xc09a002a0x2700cac10x000000000x50010000161network1eq10x00000011122transport1eq20x000035001status01eq40x0000000100dns_drop2000drop
- diff --git a/tests/xmlfiles/40-rule-real.xml b/tests/xmlfiles/40-rule-real.xml index 835dcec..0041ebf 100644 --- a/tests/xmlfiles/40-rule-real.xml +++ b/tests/xmlfiles/40-rule-real.xml @@ -1,2 +1 @@ ipfilter
output21164network1eq40x0100a8c0
- diff --git a/tests/xmlfiles/41-rule-real.xml b/tests/xmlfiles/41-rule-real.xml index 001a20e..bd213b0 100644 --- a/tests/xmlfiles/41-rule-real.xml +++ b/tests/xmlfiles/41-rule-real.xml @@ -1,2 +1 @@ ipfilter
output31164network1gte40x0100a8c01lte40xfa00a8c0
- diff --git a/tests/xmlfiles/42-rule-real.xml b/tests/xmlfiles/42-rule-real.xml index 6398c48..b5cc1bd 100644 --- a/tests/xmlfiles/42-rule-real.xml +++ b/tests/xmlfiles/42-rule-real.xml @@ -1,2 +1 @@ ipfilter
output41164network1eq40x0100a8c000
- diff --git a/tests/xmlfiles/43-rule-real.xml b/tests/xmlfiles/43-rule-real.xml index 38be43e..a84f513 100644 --- a/tests/xmlfiles/43-rule-real.xml +++ b/tests/xmlfiles/43-rule-real.xml @@ -1,2 +1 @@ ipfilter
output51164network1eq40x0100a8c0000drop
- diff --git a/tests/xmlfiles/44-rule-real.xml b/tests/xmlfiles/44-rule-real.xml index 8ab5db9..5a99e6f 100644 --- a/tests/xmlfiles/44-rule-real.xml +++ b/tests/xmlfiles/44-rule-real.xml @@ -1,2 +1 @@ ipfilter
output61164network1eq40x0100a8c000(null)000
- diff --git a/tests/xmlfiles/45-rule-real.xml b/tests/xmlfiles/45-rule-real.xml index 165d581..53fa009 100644 --- a/tests/xmlfiles/45-rule-real.xml +++ b/tests/xmlfiles/45-rule-real.xml @@ -1,2 +1 @@ ipfilter
output7191network1eq10x00000006122transport1eq20x0000160000
- diff --git a/tests/xmlfiles/46-rule-real.xml b/tests/xmlfiles/46-rule-real.xml index d6f7376..0ddf6c8 100644 --- a/tests/xmlfiles/46-rule-real.xml +++ b/tests/xmlfiles/46-rule-real.xml @@ -1,2 +1 @@ ipfilter
output8191network1eq10x00000006104transport1eq40x1600000400
- diff --git a/tests/xmlfiles/47-rule-real.xml b/tests/xmlfiles/47-rule-real.xml index 815bd61..fde6d26 100644 --- a/tests/xmlfiles/47-rule-real.xml +++ b/tests/xmlfiles/47-rule-real.xml @@ -1,2 +1 @@ ipfilter
output91128network1eq80x0100a8c00x6400a8c000
- diff --git a/tests/xmlfiles/48-rule-real.xml b/tests/xmlfiles/48-rule-real.xml index 4b31948..547a0f6 100644 --- a/tests/xmlfiles/48-rule-real.xml +++ b/tests/xmlfiles/48-rule-real.xml @@ -1,2 +1 @@ ipfilter
output10191network1eq10x00000006108transport1eq80x160000040x00000000
- diff --git a/tests/xmlfiles/49-rule-real.xml b/tests/xmlfiles/49-rule-real.xml index a4db57f..dc662a3 100644 --- a/tests/xmlfiles/49-rule-real.xml +++ b/tests/xmlfiles/49-rule-real.xml @@ -1,2 +1 @@ ipfilter
output11191network1eq10x00000006108transport1eq80x160000040x00000000
- diff --git a/tests/xmlfiles/50-rule-real.xml b/tests/xmlfiles/50-rule-real.xml index 72bddc7..d15eff4 100644 --- a/tests/xmlfiles/50-rule-real.xml +++ b/tests/xmlfiles/50-rule-real.xml @@ -1,2 +1 @@ ipfilter
output121state011440x0000000a40x000000001neq40x000000005511407
- diff --git a/tests/xmlfiles/51-rule-real.xml b/tests/xmlfiles/51-rule-real.xml index 72cac29..471cd2b 100644 --- a/tests/xmlfiles/51-rule-real.xml +++ b/tests/xmlfiles/51-rule-real.xml @@ -1,2 +1 @@ ipfilter
output131direction01eq10x000000005160
- diff --git a/tests/xmlfiles/52-rule-real.xml b/tests/xmlfiles/52-rule-real.xml index ca14eb8..61a1269 100644 --- a/tests/xmlfiles/52-rule-real.xml +++ b/tests/xmlfiles/52-rule-real.xml @@ -1,2 +1 @@ ipfilter
output141direction01eq10x000000015011247
- diff --git a/tests/xmlfiles/53-rule-real.xml b/tests/xmlfiles/53-rule-real.xml index 304732b..d835639 100644 --- a/tests/xmlfiles/53-rule-real.xml +++ b/tests/xmlfiles/53-rule-real.xml @@ -1,2 +1 @@ ipfilter
output151status01eq40x0000000100
- diff --git a/tests/xmlfiles/54-rule-real.xml b/tests/xmlfiles/54-rule-real.xml index 5312eca..ed27e56 100644 --- a/tests/xmlfiles/54-rule-real.xml +++ b/tests/xmlfiles/54-rule-real.xml @@ -1,2 +1 @@ ipfilter
output161mark01eq40x0000006400
- diff --git a/tests/xmlfiles/55-rule-real.xml b/tests/xmlfiles/55-rule-real.xml index 757a7a2..2d2bf7f 100644 --- a/tests/xmlfiles/55-rule-real.xml +++ b/tests/xmlfiles/55-rule-real.xml @@ -1,2 +1 @@ ipfilter
output171secmark01eq40x000000005511407
- diff --git a/tests/xmlfiles/56-rule-real.xml b/tests/xmlfiles/56-rule-real.xml index 242ddbb..4596689 100644 --- a/tests/xmlfiles/56-rule-real.xml +++ b/tests/xmlfiles/56-rule-real.xml @@ -1,2 +1 @@ ipfilter
output181expiration01eq40x0000001e00
- diff --git a/tests/xmlfiles/57-rule-real.xml b/tests/xmlfiles/57-rule-real.xml index 136e5f1..6a2ad52 100644 --- a/tests/xmlfiles/57-rule-real.xml +++ b/tests/xmlfiles/57-rule-real.xml @@ -1,2 +1 @@ ipfilter
output191helper01eq40x0070746600
- diff --git a/tests/xmlfiles/58-rule-real.xml b/tests/xmlfiles/58-rule-real.xml index 4474eb2..d9bfe3a 100644 --- a/tests/xmlfiles/58-rule-real.xml +++ b/tests/xmlfiles/58-rule-real.xml @@ -1,2 +1 @@ ipfilter
output201len1eq40x000003e800
- diff --git a/tests/xmlfiles/59-rule-real.xml b/tests/xmlfiles/59-rule-real.xml index 4e231a2..6af8aa6 100644 --- a/tests/xmlfiles/59-rule-real.xml +++ b/tests/xmlfiles/59-rule-real.xml @@ -1,2 +1 @@ ipfilter
output211protocol1eq20x000000085511407
- diff --git a/tests/xmlfiles/60-rule-real.xml b/tests/xmlfiles/60-rule-real.xml index 535ab54..24cf057 100644 --- a/tests/xmlfiles/60-rule-real.xml +++ b/tests/xmlfiles/60-rule-real.xml @@ -1,2 +1 @@ ipfilter
output221mark1eq40x000000005511407
- diff --git a/tests/xmlfiles/61-rule-real.xml b/tests/xmlfiles/61-rule-real.xml index 2a5d411..3aaad57 100644 --- a/tests/xmlfiles/61-rule-real.xml +++ b/tests/xmlfiles/61-rule-real.xml @@ -1,2 +1 @@ ipfilter
output231iif1eq40x0000000100
- diff --git a/tests/xmlfiles/62-rule-real.xml b/tests/xmlfiles/62-rule-real.xml index dfb6e44..d7935d1 100644 --- a/tests/xmlfiles/62-rule-real.xml +++ b/tests/xmlfiles/62-rule-real.xml @@ -1,2 +1 @@ ipfilter
output241iifname1eq160x000000000x000000000x650000000x0030687400
- diff --git a/tests/xmlfiles/63-rule-real.xml b/tests/xmlfiles/63-rule-real.xml index b144889..f2a36f4 100644 --- a/tests/xmlfiles/63-rule-real.xml +++ b/tests/xmlfiles/63-rule-real.xml @@ -1,2 +1 @@ ipfilter
output251oif1eq40x0000000100
- diff --git a/tests/xmlfiles/64-rule-real.xml b/tests/xmlfiles/64-rule-real.xml index a83efb9..01a8708 100644 --- a/tests/xmlfiles/64-rule-real.xml +++ b/tests/xmlfiles/64-rule-real.xml @@ -1,2 +1 @@ ipfilter
output261oifname1eq160x000000000x000000000x650000000x0030687400
- diff --git a/tests/xmlfiles/65-rule-real.xml b/tests/xmlfiles/65-rule-real.xml index cfec802..2d59190 100644 --- a/tests/xmlfiles/65-rule-real.xml +++ b/tests/xmlfiles/65-rule-real.xml @@ -1,2 +1 @@ ipfilter
output271skuid1eq40x000003e800
- diff --git a/tests/xmlfiles/66-rule-real.xml b/tests/xmlfiles/66-rule-real.xml index 57b0d45..f9d9c5e 100644 --- a/tests/xmlfiles/66-rule-real.xml +++ b/tests/xmlfiles/66-rule-real.xml @@ -1,2 +1 @@ ipfilter
output281skgid1eq40x000003e800
- diff --git a/tests/xmlfiles/67-rule-real.xml b/tests/xmlfiles/67-rule-real.xml index 1ee49fc..555139c 100644 --- a/tests/xmlfiles/67-rule-real.xml +++ b/tests/xmlfiles/67-rule-real.xml @@ -1,2 +1 @@ ipfilter
output291secmark1eq40x000000005511407
- diff --git a/tests/xmlfiles/68-rule-real.xml b/tests/xmlfiles/68-rule-real.xml index 70bccd9..a0ff9ce 100644 --- a/tests/xmlfiles/68-rule-real.xml +++ b/tests/xmlfiles/68-rule-real.xml @@ -1,2 +1 @@ ipfilter
output32191network1eq10x00000006122transportset01000
- diff --git a/tests/xmlfiles/69-rule-real.xml b/tests/xmlfiles/69-rule-real.xml index 2c61706..e39e2cb 100644 --- a/tests/xmlfiles/69-rule-real.xml +++ b/tests/xmlfiles/69-rule-real.xml @@ -1,2 +1 @@ ipfilter
output331164networkset110
- diff --git a/tests/xmlfiles/70-rule-real.xml b/tests/xmlfiles/70-rule-real.xml index 0a876e9..6edd166 100644 --- a/tests/xmlfiles/70-rule-real.xml +++ b/tests/xmlfiles/70-rule-real.xml @@ -1,2 +1 @@ ipfilter
output34191network1eq10x00000006122transportmap010
- diff --git a/tests/xmlfiles/71-rule-real.xml b/tests/xmlfiles/71-rule-real.xml index 143de72..fba3af9 100644 --- a/tests/xmlfiles/71-rule-real.xml +++ b/tests/xmlfiles/71-rule-real.xml @@ -1,2 +1 @@ ipfilter
output35191network1eq10x00000006122transportmap110
- diff --git a/tests/xmlfiles/72-rule-real.xml b/tests/xmlfiles/72-rule-real.xml index fb35523..aac8b85 100644 --- a/tests/xmlfiles/72-rule-real.xml +++ b/tests/xmlfiles/72-rule-real.xml @@ -1,2 +1 @@ ipfilter
output361164networkmap210
- diff --git a/tests/xmlfiles/73-set.xml b/tests/xmlfiles/73-set.xml index 37fb2ee..6a9323a 100644 --- a/tests/xmlfiles/73-set.xml +++ b/tests/xmlfiles/73-set.xml @@ -1,2 +1 @@ ipfilter
set000000040x0300a8c0040x0200a8c0040x0100a8c0
- diff --git a/tests/xmlfiles/74-set.xml b/tests/xmlfiles/74-set.xml index 679ee30..5f0e7ae 100644 --- a/tests/xmlfiles/74-set.xml +++ b/tests/xmlfiles/74-set.xml @@ -1,2 +1 @@ ip6filter
set0000000160xc09a002a0x2700cac10x000000000x700100000160xc09a002a0x2700cac10x000000000x50010000
-