From 6b29a5bebb957387fe1aac8fcbfd431e6be237f0 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Fri, 11 Dec 2015 11:10:14 +0100 Subject: tests/: rearrange tests directory Rearrange the directory to obtain a better organization of files and tests-suites. We end with a tree like this: tests | .--- py .--- shell .--- files This was suggested by Pablo. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- tests/regression/arp/arp.t | 53 --------- tests/regression/arp/arp.t.payload | 217 ---------------------------------- tests/regression/arp/chains.t | 6 - tests/regression/arp/chains.t.payload | 0 4 files changed, 276 deletions(-) delete mode 100644 tests/regression/arp/arp.t delete mode 100644 tests/regression/arp/arp.t.payload delete mode 100644 tests/regression/arp/chains.t delete mode 100644 tests/regression/arp/chains.t.payload (limited to 'tests/regression/arp') diff --git a/tests/regression/arp/arp.t b/tests/regression/arp/arp.t deleted file mode 100644 index c4e07d57..00000000 --- a/tests/regression/arp/arp.t +++ /dev/null @@ -1,53 +0,0 @@ -*arp;test-arp -# filter chains available are: input, output, forward -:input;type filter hook input priority 0 - -arp htype 1;ok -arp htype != 1;ok -arp htype 22;ok -arp htype != 233;ok -arp htype 33-45;ok -arp htype != 33-45;ok -arp htype { 33, 55, 67, 88};ok -- arp htype != { 33, 55, 67, 88};ok -arp htype { 33-55};ok -- arp htype != { 33-55};ok - -arp ptype 0x0800;ok;arp ptype ip - -arp hlen 22;ok -arp hlen != 233;ok -arp hlen 33-45;ok -arp hlen != 33-45;ok -arp hlen { 33, 55, 67, 88};ok -- arp hlen != { 33, 55, 67, 88};ok -arp hlen { 33-55};ok -- arp hlen != { 33-55};ok - -arp plen 22;ok -arp plen != 233;ok -arp plen 33-45;ok -arp plen != 33-45;ok -arp plen { 33, 55, 67, 88};ok -- arp plen != { 33, 55, 67, 88};ok -arp plen { 33-55};ok -- arp plen != {33-55};ok - -arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request};ok -- arp operation != {nak, inreply, inrequest, rreply, rrequest, reply, request};ok -arp operation request;ok -arp operation reply;ok -arp operation rrequest;ok -arp operation rreply;ok -arp operation inrequest;ok -arp operation inreply;ok -arp operation nak;ok -arp operation reply;ok -arp operation != request;ok -arp operation != reply;ok -arp operation != rrequest;ok -arp operation != rreply;ok -arp operation != inrequest;ok -arp operation != inreply;ok -arp operation != nak;ok -arp operation != reply;ok diff --git a/tests/regression/arp/arp.t.payload b/tests/regression/arp/arp.t.payload deleted file mode 100644 index bfa37cdd..00000000 --- a/tests/regression/arp/arp.t.payload +++ /dev/null @@ -1,217 +0,0 @@ -# arp htype 1 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00000100 ] - -# arp htype != 1 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp neq reg 1 0x00000100 ] - -# arp htype 22 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp eq reg 1 0x00001600 ] - -# arp htype != 233 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp neq reg 1 0x0000e900 ] - -# arp htype 33-45 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp gte reg 1 0x00002100 ] - [ cmp lte reg 1 0x00002d00 ] - -# arp htype != 33-45 -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ cmp lt reg 1 0x00002100 ] - [ cmp gt reg 1 0x00002d00 ] - -# arp htype { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 - element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end] -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp htype { 33-55} -set%d test-arp 7 -set%d test-arp 0 - element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end] -arp test-arp input - [ payload load 2b @ network header + 0 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp ptype 0x0800 -arp test-arp input - [ payload load 2b @ network header + 2 => reg 1 ] - [ cmp eq reg 1 0x00000008 ] - -# arp hlen 22 -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] - -# arp hlen != 233 -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] - -# arp hlen 33-45 -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ cmp gte reg 1 0x00000021 ] - [ cmp lte reg 1 0x0000002d ] - -# arp hlen != 33-45 -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ cmp lt reg 1 0x00000021 ] - [ cmp gt reg 1 0x0000002d ] - -# arp hlen { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp hlen { 33-55} -set%d test-arp 7 -set%d test-arp 0 - element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] -arp test-arp input - [ payload load 1b @ network header + 4 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp plen 22 -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ cmp eq reg 1 0x00000016 ] - -# arp plen != 233 -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ cmp neq reg 1 0x000000e9 ] - -# arp plen 33-45 -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ cmp gte reg 1 0x00000021 ] - [ cmp lte reg 1 0x0000002d ] - -# arp plen != 33-45 -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ cmp lt reg 1 0x00000021 ] - [ cmp gt reg 1 0x0000002d ] - -# arp plen { 33, 55, 67, 88} -set%d test-arp 3 -set%d test-arp 0 - element 00000021 : 0 [end] element 00000037 : 0 [end] element 00000043 : 0 [end] element 00000058 : 0 [end] -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp plen { 33-55} -set%d test-arp 7 -set%d test-arp 0 - element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end] -arp test-arp input - [ payload load 1b @ network header + 5 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp operation {nak, inreply, inrequest, rreply, rrequest, reply, request} -set%d test-arp 3 -set%d test-arp 0 - element 00000a00 : 0 [end] element 00000900 : 0 [end] element 00000800 : 0 [end] element 00000400 : 0 [end] element 00000300 : 0 [end] element 00000200 : 0 [end] element 00000100 : 0 [end] -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ lookup reg 1 set set%d ] - -# arp operation request -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000100 ] - -# arp operation reply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000200 ] - -# arp operation rrequest -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000300 ] - -# arp operation rreply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000400 ] - -# arp operation inrequest -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000800 ] - -# arp operation inreply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000900 ] - -# arp operation nak -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000a00 ] - -# arp operation reply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp eq reg 1 0x00000200 ] - -# arp operation != request -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000100 ] - -# arp operation != reply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000200 ] - -# arp operation != rrequest -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000300 ] - -# arp operation != rreply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000400 ] - -# arp operation != inrequest -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000800 ] - -# arp operation != inreply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000900 ] - -# arp operation != nak -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000a00 ] - -# arp operation != reply -arp test-arp input - [ payload load 2b @ network header + 6 => reg 1 ] - [ cmp neq reg 1 0x00000200 ] - diff --git a/tests/regression/arp/chains.t b/tests/regression/arp/chains.t deleted file mode 100644 index cf08c1af..00000000 --- a/tests/regression/arp/chains.t +++ /dev/null @@ -1,6 +0,0 @@ -*arp;test-arp - -# filter chains available are: input, output, forward -:input;type filter hook input priority 0 -:forward;type filter hook forward priority 0 -:output;type filter hook output priority 0 diff --git a/tests/regression/arp/chains.t.payload b/tests/regression/arp/chains.t.payload deleted file mode 100644 index e69de29b..00000000 -- cgit v1.2.3