Add bind testsuite.

* README.submodule: Update URL.
* src/bind-lex.l (grecs_bind_new_source): Scan include path.
* src/grecs.h (grecs_find_include_file): new proto.
* src/preproc.c (try_file): Rename to grecs_find_include_file. Change
signature and return type. All uses updated.
* tests/Makefile.am (EXTRA_DIST): Add new configs.
(TESTSUITE_AT): Add parser-bind.at.
* tests/gcffmt.c: Add -I (-include) option.
* tests/testsuite.at: Include parser-bind.at.

* tests/bind.conf: New file.
* tests/bind.dlz: New file.
* tests/bind.ext.conf: New file.
* tests/bind.int.conf: New file.
* tests/bind.keys: New file.
* tests/parser-bind.at: New file.

13 files changed, 363 insertions, 23 deletions

diff --git a/README.submodule b/README.submodule
index 03428d4..3067e92 100644
--- a/README.submodule
+++ b/README.submodule
@@ -34,3 +34,3 @@ recursively, joining several trees together, reductions, etc.
 
-   git submodule git.gnu.org.ua/gitroot/grecs.git grecs
+   git submodule git://git.gnu.org.ua/grecs.git grecs
 
diff --git a/src/bind-lex.l b/src/bind-lex.l
index 12dddf7..a5cf644 100644
--- a/src/bind-lex.l
+++ b/src/bind-lex.l
@@ -194,3 +194,16 @@ grecs_bind_new_source(const char *name)
         struct stat st;
-        FILE *fp = fopen(name, "r");
+        FILE *fp;
+        
+        if (access(name, F_OK)) {
+                int ec = errno;
+                char *tmp = grecs_find_include_file(name, 0);
+                if (!tmp) {
+                        grecs_error(loc, ec, _("cannot open `%s'"), name);
+                        return 1;
+                }
+                name = grecs_install_text(tmp);
+                free(tmp);
+        }
+        
+        fp = fopen(name, "r");
         if (!fp) {
@@ -198,3 +211,3 @@ grecs_bind_new_source(const char *name)
                 return 1;
-        }
+        }
         if (fstat(fileno(fp), &st)) {
diff --git a/src/grecs.h b/src/grecs.h
index b839d71..5eef48d 100644
--- a/src/grecs.h
+++ b/src/grecs.h
@@ -265,2 +265,4 @@ int grecs_preproc_run(const char *config_file, const char *extpp);
 
+char *grecs_find_include_file(const char *name, int allow_cwd);
+
 FILE *grecs_preproc_extrn_start(const char *file, pid_t *ppid);
diff --git a/src/preproc.c b/src/preproc.c
index 8debdcf..4ab3066 100644
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -474,4 +474,4 @@ pop_source()
 
-static int
-try_file(const char *name, int allow_cwd, int err_not_found, char **newp)
+char *
+grecs_find_include_file(const char *name, int allow_cwd)
 {
@@ -497,12 +497,6 @@ try_file(const char *name, int allow_cwd, int err_not_found, char **newp)
                 pp_list_find(std_include_path, &fd);
-
-                if (!fd.found && err_not_found) {
-                        grecs_error(&LOCUS, 0,
-                                    _("%s: No such file or directory"), name);
-                        *newp = NULL;
-                }
+                if (!fd.found)
+                        return NULL;
         }
-        if (fd.found)
-                *newp = fd.buf;
-        return fd.found;
+        return fd.buf;
 }
@@ -537,4 +531,9 @@ parse_include(const char *text, int once)
                 
-                if (p[0] != '/' && try_file(p, allow_cwd, 1, &tmp))
-                        p = tmp;
+                if (p[0] != '/') {
+                        p = grecs_find_include_file(p, allow_cwd);
+                        if (!p)
+                                grecs_error(&LOCUS, 0,
+                                            _("%s: No such file or directory"),
+                                            p);
+                }
         }
@@ -575,4 +574,5 @@ grecs_preproc_run(const char *config_file, const char *extpp)
                 char *cmd = NULL;
-                
-                if (try_file("pp-setup", 1, 0, &setup_file)) {
+
+                setup_file = grecs_find_include_file("pp-setup", 1);
+                if (setup_file) {
                         size_t size = 0;
@@ -583,6 +583,6 @@ grecs_preproc_run(const char *config_file, const char *extpp)
                 } else
-                        cmd = grecs_strdup (extpp);
+                        cmd = grecs_strdup(extpp);
                 /*FIXME_DEBUG_F1 (2, "Running preprocessor: `%s'", cmd);*/
                 outfile = popen(cmd, "w");
-                if (!outfile){
+                if (!outfile) {
                         grecs_error(NULL, errno,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f5d1f6f..1b47712 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,3 +16,15 @@
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 gcf1.conf meta1.conf git.conf
+EXTRA_DIST = \
+ $(TESTSUITE_AT)\
+ testsuite\
+ package.m4\
+ gcf1.conf\
+ bind.conf\
+ bind.keys\
+ bind.int.conf\
+ bind.ext.conf\
+ bind.dlz\
+ meta1.conf\
+ git.conf
+
 DISTCLEANFILES       = atconfig $(check_SCRIPTS)
@@ -53,2 +65,3 @@ TESTSUITE_AT = \
  join.at\
+ parser-bind.at\
  parser-git.at\
diff --git a/tests/bind.conf b/tests/bind.conf
new file mode 100644
index 0000000..2579a58
--- /dev/null
+++ b/tests/bind.conf
@@ -0,0 +1,126 @@
+# Sample Bind configuration file for Grecs testsuite.
+# Nothing to copyright, really:)
+
+acl upd-dyn-vpn {
+        key vpn.;
+        10.11.0.1;
+        10.10.0.1;
+};
+
+acl foo-acl {
+        key foo.;
+};
+
+options {
+        version "Grecs testsuite";
+        coresize 0;
+        directory "/etc/namedb";
+        pid-file  "/var/log/bind/named.pid";
+        allow-transfer {
+                foo-acl;
+        };
+        allow-query {
+                any;
+        };
+        serial-query-rate 5;
+        max-journal-size 5m;
+        check-names master warn;
+        check-names slave warn;
+        check-names response ignore;
+};
+
+logging {
+        channel default_channel {
+                file "/var/log/bind/named.log" versions 9 size 524288;
+                print-time yes;
+                print-severity yes;
+        }; 
+        channel debug_channel {
+                file "/var/log/bind/named.run" versions 9 size 524288;
+                print-time yes;
+                print-severity yes;
+                severity dynamic;
+        };
+        channel security_channel {
+                file "/var/log/bind/security" versions 9 size 524288;
+                print-time yes;
+                print-severity yes;
+        };      
+        channel xfer_in_channel {
+                file "/var/log/bind/named-xfer.in" versions 9 size 524288;
+                print-time yes;
+        };
+        channel xfer_out_channel {
+                file    "/var/log/bind/named-xfer.out" versions 9 size 524288;
+                print-time yes;
+        };
+        channel lamers_channel {
+                file    "/var/log/bind/lamers.log" versions 5 size 524288;
+                print-time yes;
+                print-category yes;
+        };
+        channel update_channel {
+                file "/var/log/bind/update.log" versions 9 size 524288;
+                print-time yes;
+                print-category yes;
+                severity debug 5;
+        };
+        channel notify_channel {
+                file "/var/log/bind/notify.log" versions 9 size 524288;
+                print-time yes;
+                print-category yes;
+        };
+        channel query_channel {
+                file "/var/log/bind/query.log" versions 9 size 524288;
+                print-time yes;
+        };
+        category security {
+                security_channel;
+        };
+        category queries {
+#               query_channel;
+                null;
+        };
+        category default {
+                default_channel;
+                debug_channel;
+        };
+        category xfer-in {
+                xfer_in_channel;        
+        };
+        category xfer-out {
+                xfer_out_channel;
+        };
+        category delegation-only {
+                lamers_channel;
+        };
+        category lame-servers {
+                lamers_channel;
+        };
+        category update {
+                update_channel;
+        };