Replacing test files from previous commit to the right directory. There is no

trigger to run tests from relayd directory, so previous had no practical
effect.

diff --git a/regress/usr.sbin/relayd/args-http-filter-url-digest.pl b/regress/usr.sbin/relayd/args-http-filter-url-digest.pl
new file mode 100644 (file)
index 0000000..c3739a8
--- /dev/null
+++ b/regress/usr.sbin/relayd/args-http-filter-url-digest.pl
@@ -0,0 +1,31 @@
+use strict;
+use warnings;
+
+our %args = (
+    client => {
+       func => \&http_client,
+       path => "a/b/c/d/e/f/gindex.html",
+       loggrep => [
+           qr/403 Forbidden/,
+           qr/Server: OpenBSD relayd/,
+           qr/Connection: close/,
+       ],
+       httpnok => 1,
+    },
+    relayd => {
+       protocol => [ "http",
+           'return error',
+           'url filter digest 0ac8ccfc03317891ae2820de10ee2167d31ebd16 log',
+       ],
+       loggrep => {
+           qr/rejecting request \(403 Forbidden\)/ => 1,
+           qr/\[0ac8ccfc03317891ae2820de10ee2167d31ebd16:/ => 1,
+       },
+    },
+    server => {
+       noserver => 1,
+       nocheck => 1,
+    },
+);
+
+1;

diff --git a/regress/usr.sbin/relayd/args-http-filter-url-file.in b/regress/usr.sbin/relayd/args-http-filter-url-file.in
new file mode 100644 (file)
index 0000000..20fd826
--- /dev/null
+++ b/regress/usr.sbin/relayd/args-http-filter-url-file.in
@@ -0,0 +1,2 @@
+/3
+/0

diff --git a/regress/usr.sbin/relayd/args-http-filter-url-file.pl b/regress/usr.sbin/relayd/args-http-filter-url-file.pl
new file mode 100644 (file)
index 0000000..a048563
--- /dev/null
+++ b/regress/usr.sbin/relayd/args-http-filter-url-file.pl
@@ -0,0 +1,29 @@
+use strict;
+use warnings;
+
+my @lengths = (1, 2, 4, 0, 3);
+our %args = (
+    client => {
+       func => sub { eval { http_client(@_) }; warn $@ },
+       lengths => \@lengths,
+       loggrep => qr/Forbidden/,
+    },
+    relayd => {
+       protocol => [ "http",
+           'return error',
+           'label test_reject_label',
+           'path filter file args-http-filter-url-file.in log',
+           'no label',
+       ],
+       loggrep => {
+               qr/rejecting request/ => 1,
+               qr/\[test_reject_label\, \/0\:/ => 1
+       },
+    },
+    server => {
+       func => \&http_server,
+       lengths => (1, 2, 4),
+    },
+);
+
+1;

diff --git a/usr.sbin/relayd/args-http-filter-url-digest.pl b/usr.sbin/relayd/args-http-filter-url-digest.pl
deleted file mode 100644 (file)
index c3739a8..0000000
--- a/usr.sbin/relayd/args-http-filter-url-digest.pl
+++ /dev/null
@@ -1,31 +0,0 @@
-use strict;
-use warnings;
-
-our %args = (
-    client => {
-       func => \&http_client,
-       path => "a/b/c/d/e/f/gindex.html",
-       loggrep => [
-           qr/403 Forbidden/,
-           qr/Server: OpenBSD relayd/,
-           qr/Connection: close/,
-       ],
-       httpnok => 1,
-    },
-    relayd => {
-       protocol => [ "http",
-           'return error',
-           'url filter digest 0ac8ccfc03317891ae2820de10ee2167d31ebd16 log',
-       ],
-       loggrep => {
-           qr/rejecting request \(403 Forbidden\)/ => 1,
-           qr/\[0ac8ccfc03317891ae2820de10ee2167d31ebd16:/ => 1,
-       },
-    },
-    server => {
-       noserver => 1,
-       nocheck => 1,
-    },
-);
-
-1;

diff --git a/usr.sbin/relayd/args-http-filter-url-file.in b/usr.sbin/relayd/args-http-filter-url-file.in
deleted file mode 100644 (file)
index 20fd826..0000000
--- a/usr.sbin/relayd/args-http-filter-url-file.in
+++ /dev/null
@@ -1,2 +0,0 @@
-/3
-/0

diff --git a/usr.sbin/relayd/args-http-filter-url-file.pl b/usr.sbin/relayd/args-http-filter-url-file.pl
deleted file mode 100644 (file)
index a048563..0000000
--- a/usr.sbin/relayd/args-http-filter-url-file.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-use strict;
-use warnings;
-
-my @lengths = (1, 2, 4, 0, 3);
-our %args = (
-    client => {
-       func => sub { eval { http_client(@_) }; warn $@ },
-       lengths => \@lengths,
-       loggrep => qr/Forbidden/,
-    },
-    relayd => {
-       protocol => [ "http",
-           'return error',
-           'label test_reject_label',
-           'path filter file args-http-filter-url-file.in log',
-           'no label',
-       ],
-       loggrep => {
-               qr/rejecting request/ => 1,
-               qr/\[test_reject_label\, \/0\:/ => 1
-       },
-    },
-    server => {
-       func => \&http_server,
-       lengths => (1, 2, 4),
-    },
-);
-
-1;