diff -uNrd texinfo.orig/configure.ac texinfo/configure.ac --- texinfo.orig/configure.ac 2007-12-24 19:16:36.000000000 -0500 +++ texinfo/configure.ac 2007-12-24 19:23:18.000000000 -0500 @@ -231,5 +231,7 @@ makeinfo/tests/Makefile po/Makefile.in util/Makefile + util/tests/Makefile + util/tests/install-info/Makefile ]) AC_OUTPUT diff -uNrd texinfo.orig/doc/texinfo.txi texinfo/doc/texinfo.txi --- texinfo.orig/doc/texinfo.txi 2007-11-27 11:55:47.000000000 -0500 +++ texinfo/doc/texinfo.txi 2007-12-25 14:42:01.000000000 -0500 @@ -16301,10 +16301,13 @@ command. If you use them later on in the input, @code{install-info} will not notice them. -As a matter of convention, please start the description for the main -entry (above, @samp{The GNU documentation format}) at column 32. This -will make it align with most others. Description for individual -utilities best start in column 48, where possible. address@hidden will automatically reformat the description of the +menu entries it is adding. As a matter of convention, the description of +the main entry (above, @samp{The GNU documentation format}) should start +at column 32. This will make it align with most others. Description for +individual utilities best start in column 48, where possible. +For more information about formatting see the @samp{--calign}, @samp{--align}, +and @samp{--max-width} options in @ref{Invoking install-info}. If you use @code{@@dircategory} more than once in the Texinfo source, each usage specifies the `current' category; any subsequent @@ -16345,7 +16348,8 @@ @code{install-info} inserts menu entries from an Info file into the top-level @file{dir} file in the Info system (see the previous sections -for an explanation of how the @file{dir} file works). It's most often +for an explanation of how the @file{dir} file works). @code{install-info} +also removes menu entries from the @file{dir} file. It's most often run as part of software installation, or when constructing a @file{dir} file for all manuals on a system. Synopsis: @@ -16374,6 +16378,28 @@ Options: @table @code address@hidden --add-once +Specifies that the entry or entries will only be put into a single section. + address@hidden address@hidden address@hidden address@hidden +Specifies the column that the second and subsequent lines of menu entry's +description will be formatted to begin at. The default for this option is address@hidden It is used in conjunction with the @samp{--max-width} option. address@hidden starts counting at 1. + address@hidden --append-new-sections +Instead of alphabetizing new sections, place them at the end of the DIR file. + address@hidden address@hidden address@hidden address@hidden +Specifies the column that the first line of menu entry's description will +be formatted to begin at. The default for this option is @samp{33}. It is +used in conjunction with the @samp{--max-width} option. +When the name of the menu entry exceeds this column, entry's description +will start on the following line. address@hidden starts counting at 1. + @item --debug @opindex --debug Report what is being done. @@ -16383,12 +16409,23 @@ Delete the entries in @var{info-file} from @var{dir-file}. The file name in the entry in @var{dir-file} must be @var{info-file} (except for an optional @samp{.info} in either one). Don't insert any new entries. +Any empty sections that result from the removal are also removed. + address@hidden address@hidden address@hidden address@hidden +Specify the explanatory portion of the menu entry. If you don't specify +a description (either via @samp{--entry}, @samp{--item} or this option), +the description is taken from the Info file itself. @item address@hidden @opindex address@hidden Specify file name of the Info directory file. This is equivalent to using the @var{dir-file} argument. address@hidden --dry-run address@hidden --dry-run +Same as @samp{--test}. + @item address@hidden @opindex address@hidden Insert @var{text} as an Info directory entry; @var{text} should have the @@ -16412,11 +16449,47 @@ Specify the directory where the directory file @file{dir} resides. Equivalent to @address@hidden/dir}. address@hidden address@hidden address@hidden address@hidden +Same as @samp{--info-dir}. + @item address@hidden @opindex address@hidden Same as @address@hidden An Info directory entry is actually a menu item. address@hidden --keep-old address@hidden --keep-old +Do not replace pre-existing menu entries. When @samp{--remove} is specified, +this option means that empty sections are not removed. + address@hidden address@hidden address@hidden address@hidden +Specifies the column that the menu entry's description will be word-wrapped +at. @var{column} starts counting at 1. + address@hidden address@hidden address@hidden address@hidden +Same as @samp{--max-width}. + address@hidden address@hidden address@hidden address@hidden +Same as @samp{--name}. + address@hidden address@hidden address@hidden address@hidden +Specify the name portion of the menu entry. If the @var{text} does not start +with an asterisk @samp{*}, it is presumed to be the text after the @samp{*} +and before the parentheses that specify the Info file. Otherwise @var{text} +is taken verbatim, and is meant to include the text up to and including the +first dot @samp{.}. If you don't specify the name (either via @samp{--entry}, address@hidden or this option), it is taken from the Info file itself. If +the Info does not contain the name, the basename of the Info file is used. + address@hidden --no-indent address@hidden --no-indent +Suppress formatting of new entries into the @file{dir} file. + @item --quiet @opindex --quiet @itemx --silent @@ -16438,15 +16511,36 @@ Put this file's entries in section @var{sec} of the directory. If you specify more than one section, all the entries are added in each of the sections. If you don't specify any sections, they are determined from -information in the Info file itself. +information in the Info file itself. If the Info file doesn't specify +a section, the menu entries are put into the Miscellaneous section. address@hidden address@hidden address@hidden address@hidden -If an entry is added to a section that does not exist, look for a -section matching the regular expression @var{regex} (and ignoring -case) before starting a new section. Specify @var{regex} using -basic regular expression syntax, more or less as used with address@hidden, for example. address@hidden --section @var{regex} @var{sec} address@hidden --section @var{regex} @var{sec} +Same as @address@hidden address@hidden --add-once}. + address@hidden tries to detect when this alternate syntax is used, +but does not always guess correctly! Here is the heuristic that address@hidden uses: address@hidden address@hidden +If the second argument to @code{--section} starts with a hyphen, the original syntax is presumed. address@hidden +If the second argument to @code{--section} is a file that can be opened, the original syntax is presumed address@hidden +Otherwise the alternate syntax is used. address@hidden enumerate + +When heuristic fails because your section title starts with a hyphen, or it +happens to be a filename that can be opened, the syntax should be changed +to @address@hidden address@hidden --add-once}. + + address@hidden address@hidden address@hidden address@hidden +Put this file's entries into any section that matches @var{regex}. If +more than one section matches, all of the entries are added in each of the +sections. Specify @var{regex} using basic regular expression syntax, more +or less as used with @command{grep}, for example. @item --test @opindex --test diff -uNrd texinfo.orig/util/install-info.c texinfo/util/install-info.c --- texinfo.orig/util/install-info.c 2007-12-02 20:38:43.000000000 -0500 +++ texinfo/util/install-info.c 2007-12-25 14:42:16.000000000 -0500 @@ -20,6 +20,9 @@ #include "system.h" #include #include +#include + +#define TAB_WIDTH 8 static char *progname = "install-info"; @@ -46,8 +49,12 @@ /* Vector containing pointers to the entries to add before this line. The vector is null-terminated. */ struct spec_entry **add_entries_before; - /* 1 means output any needed new sections before this line. */ - int add_sections_before; + /* Vector containing pointers to the sections to add before this line. + The vector is not null-terminated. */ + struct spec_section **add_sections_before; + /* The vector ADD_SECTIONS_BEFORE_HERE contains exactly this many + pointers to sections. */ + int num_sections_to_add; /* 1 means don't output this line. */ int delete; }; @@ -77,6 +84,19 @@ /* A pointer to a section that is beyond the end of the chain whose head is pointed to by entry_sections. */ struct spec_section *entry_sections_tail; + /* Non-zero means that the entry doesn't have a name specified. This + can only happen if a --description preceeds a --name option. */ + int missing_name; + /* Non-zero means that the entry doesn't have a description. This + happens when a --name option is given prior to a --description + option. */ + int missing_description; + /* Non-zero means that the entry doesn't have an Info file specified. + This means that the entry was taken from the command-line but it + only contains the name, and not the info file's basename, which + we get later on. This only happens on entries that originate + from --name options. */ + int missing_basename; }; @@ -119,36 +139,67 @@ struct option longopts[] = { + { "add-once", no_argument, NULL, '1'}, + { "align", required_argument, NULL, 'A'}, + { "append-new-sections", no_argument, NULL, 'a'}, + { "calign", required_argument, NULL, 'C'}, { "debug", no_argument, NULL, 'g' }, { "delete", no_argument, NULL, 'r' }, { "dir-file", required_argument, NULL, 'd' }, { "entry", required_argument, NULL, 'e' }, + { "name", required_argument, NULL, 't' }, + { "menuentry", required_argument, NULL, 't' }, + { "description", required_argument, NULL, 'c' }, { "help", no_argument, NULL, 'h' }, + { "no-indent", no_argument, NULL, 'I' }, { "infodir", required_argument, NULL, 'D' }, { "info-dir", required_argument, NULL, 'D' }, { "info-file", required_argument, NULL, 'i' }, { "item", required_argument, NULL, 'e' }, + { "keep-old", no_argument, NULL, 'k' }, + { "maxwidth", required_argument, NULL, 'W'}, + { "max-width", required_argument, NULL, 'W'}, { "quiet", no_argument, NULL, 'q' }, { "remove", no_argument, NULL, 'r' }, { "remove-exactly", no_argument, NULL, 'x' }, { "section", required_argument, NULL, 's' }, - { "section-regex", required_argument, NULL, 'R' }, + { "regex", required_argument, NULL, 'R' }, { "silent", no_argument, NULL, 'q' }, { "test", no_argument, NULL, 'n' }, + { "dry-run", no_argument, NULL, 'n' }, { "version", no_argument, NULL, 'V' }, { 0 } }; regex_t *psecreg = NULL; -/* Nonzero means that the name specified for the info file will be used +/* Nonzero means that the name specified for the Info file will be used (without removing .gz, .info extension or leading path) to match the entries that must be removed. */ int remove_exactly = 0; +/* Nonzero means that sections that don't have entries in them will be + deleted. */ +int remove_empty_sections = 1; + +/* Nonzero means that new Info entries into the DIR file will go into all + sections that match with --section-regex or --section. Zero means + that new entries wil go into the first section that matches.*/ +int add_entries_into_all_matching_sections = 1; + +/* Nonzero means we do not replace same-named info entries. */ +int keep_old_flag = 0; + /* Nonzero means --test was specified, to inhibit updating the dir file. */ int chicken_flag = 0; +/* Zero means that entries will not be formatted when they are either + added or replaced. */ +int indent_flag = 1; + +/* Zero means that new sections will be added at the end of the DIR file. */ +int order_new_sections_alphabetically_flag = 1; + /* Error message functions. */ @@ -465,12 +516,24 @@ If you specify more than one entry, they are all added.\n\ If you don't specify any entries, they are determined\n\ from information in the Info file itself.\n\ + When removing TEXT is the name of the entry to remove.\n\ + TEXT is only removed as a last-ditch effort if the \n\ + entry as determined from the Info file is not present \n\ + and the basename of the Info file isn't found either.\n\ + --name=TEXT the name of the entry is TEXT. Used with --description \n\ + to become synonymous with the --entry option.\n\ + --menuentry=TEXT same as --name=TEXT.\n\ + --description=TEXT the description of the entry is TEXT. It is used with \n\ + the --name option to become synonymous with the \n\ + --entry option.\n\ --help display this help and exit.\n\ --info-file=FILE specify Info file to install in the directory.\n\ This is equivalent to using the INFO-FILE argument.\n\ --info-dir=DIR same as --dir-file=DIR/dir.\n\ - --item=TEXT same as --entry TEXT.\n\ + --item=TEXT same as --entry=TEXT.\n\ An Info directory entry is actually a menu item.\n\ + --keep-old do not replace entries, or remove empty sections.\n\ + --no-indent do not format new entries in the DIR file.\n\ --quiet suppress warnings.\n\ --remove same as --delete.\n\ --remove-exactly only remove if the info file name matches exactly;\n\ @@ -480,10 +543,11 @@ are added in each of the sections.\n\ If you don't specify any sections, they are determined\n\ from information in the Info file itself.\n\ - --section-regex=R if an entry is added to a section that does not exist,\n\ - look for a section matching basic regular expression R\n\ - (and ignoring case) before starting a new section.\n\ + --section R SEC equivalent to --regex=R --section=SEC --add-once.\n\ + --regex=R put this file's entries in all sections that match the\n\ + regular expression R (ignoring case).\n\ --test suppress updating of DIR-FILE.\n\ + --dry-run same as --test.\n\ --silent suppress warnings.\n\ --version display version information and exit.\n\ "), progname); @@ -749,6 +813,7 @@ int n_entries_to_add, struct spec_entry *entries_to_add, struct spec_section *input_sections, char *compression_program) { + int n_entries_added = 0; int i; FILE *output; @@ -778,33 +843,34 @@ struct spec_entry *this = dir_lines[i].add_entries_before[j]; if (this == 0) break; + if (n_entries_added >= 1 && + !add_entries_into_all_matching_sections) + break; fputs (this->text, output); + n_entries_added++; } /* If we decided to add some sections here because there are no such sections in the file, - output them now. */ + output them now. + FIXME: we add all sections here, but they should + be interspersed throughout the DIR file in + alphabetic order. */ if (dir_lines[i].add_sections_before) { struct spec_section *spec; - struct spec_section **sections; - int n_sections = 0; struct spec_entry *entry; struct spec_entry **entries; int n_entries = 0; - /* Count the sections and allocate a vector for all of them. */ - for (spec = input_sections; spec; spec = spec->next) - n_sections++; - sections = ((struct spec_section **) - xmalloc (n_sections * sizeof (struct spec_section *))); + /* If we specified --add-once, and we've added an entry, then + it's time to bail. */ + if (n_entries_added >= 1 && + !add_entries_into_all_matching_sections) + break; - /* Fill the vector SECTIONS with pointers to all the sections, - and sort them. */ - j = 0; - for (spec = input_sections; spec; spec = spec->next) - sections[j++] = spec; - qsort (sections, n_sections, sizeof (struct spec_section *), - compare_section_names); + qsort (dir_lines[i].add_sections_before, + dir_lines[i].num_sections_to_add, + sizeof (struct spec_section *), compare_section_names); /* Count the entries and allocate a vector for all of them. */ for (entry = entries_to_add; entry; entry = entry->next) @@ -823,9 +889,9 @@ /* Generate the new sections in alphabetical order. In each new section, output all of the entries that belong to that section, in alphabetical order. */ - for (j = 0; j < n_sections; j++) + for (j = 0; j < dir_lines[i].num_sections_to_add; j++) { - spec = sections[j]; + spec = dir_lines[i].add_sections_before[j]; if (spec->missing) { int k; @@ -833,6 +899,7 @@ putc ('\n', output); fputs (spec->name, output); putc ('\n', output); + spec->missing = 0; for (k = 0; k < n_entries; k++) { struct spec_section *spec1; @@ -852,8 +919,8 @@ } } + n_entries_added++; free (entries); - free (sections); } /* Output the original dir lines unless marked for deletion. */ @@ -877,7 +944,8 @@ specifies. Return the number of entries to add from this file. */ int parse_input (const struct line_data *lines, int nlines, - struct spec_section **sections, struct spec_entry **entries) + struct spec_section **sections, struct spec_entry **entries, + int delete_flag) { int n_entries = 0; int prefix_length = strlen ("INFO-DIR-SECTION "); @@ -885,7 +953,7 @@ int reset_tail = 0; char *start_of_this_entry = 0; int ignore_sections = *sections != 0; - int ignore_entries = *entries != 0; + int ignore_entries = delete_flag ? 0: *entries != 0; int i; @@ -1000,14 +1068,13 @@ return n_entries; } + /* Parse the dir file whose basename is BASE_NAME. Find all the nodes, and their menus, and the sections of their menus. */ int -parse_dir_file (struct line_data *lines, int nlines, struct node **nodes, - const char *base_name) +parse_dir_file (struct line_data *lines, int nlines, struct node **nodes) { int node_header_flag = 0; - int something_deleted = 0; int i; *nodes = 0; @@ -1094,6 +1161,29 @@ (*nodes)->last_section = next; } + } + + /* Finish the info about the end of the last node. */ + if (*nodes != 0) + { + (*nodes)->end_line = nlines; + if ((*nodes)->last_section != 0) + (*nodes)->last_section->end_line = nlines; + } +} + + +/* Iterate through NLINES LINES looking for an entry that has a name + that matches NAME. If such an entry is found, flag the entry for + deletion later on. */ + +int +mark_entry_for_deletion (struct line_data *lines, int nlines, char *name) +{ + int something_deleted = 0; + int i; + for (i = 0; i < nlines; i++) + { /* Check for an existing entry that should be deleted. Delete all entries which specify this file name. */ if (*lines[i].start == '*') @@ -1112,10 +1202,10 @@ if (*p == ':') { /* XEmacs-style entry, as in * Mew::Messaging. */ - if (menu_item_equal (q, ':', base_name)) + if (menu_item_equal (q, ':', name)) { lines[i].delete = 1; - something_deleted = 1; + something_deleted = 1; } } else @@ -1124,10 +1214,10 @@ if (*p == '(') /* if at parenthesized (FILENAME) */ { p++; - if (menu_item_equal (p, ')', base_name)) + if (menu_item_equal (p, ')', name)) { lines[i].delete = 1; - something_deleted = 1; + something_deleted = 1; } } } @@ -1141,18 +1231,521 @@ lines[i].delete = lines[i - 1].delete; } } + return something_deleted; +} - /* Finish the info about the end of the last node. */ - if (*nodes != 0) + +/* Assuming the current column is COLUMN, return the column that + printing C will move the cursor to. + The first column is 0. + This function is used to assist in indenting of entries. */ + +static size_t +adjust_column (size_t column, char c) +{ + if (c == '\b') { - (*nodes)->end_line = nlines; - if ((*nodes)->last_section != 0) - (*nodes)->last_section->end_line = nlines; + if (column > 0) + column--; } + else if (c == '\r') + column = 0; + else if (c == '\t') + column += TAB_WIDTH - column % TAB_WIDTH; + else /* if (isprint (c)) */ + column++; + return column; +} - return something_deleted; +/* Indent the Info entry's NAME and DESCRIPTION. Lines are wrapped at the + WIDTH column. The description on first line is indented at the CALIGN-th + column, and all subsequent lines are indented at the ALIGN-th column. + The resulting Info entry is put into OUTSTR. + NAME is of the form "* TEXT (TEXT)[:TEXT].". + */ +static int +format_entry (char *name, size_t name_len, char *desc, size_t desc_len, + int calign, int align, size_t width, + char **outstr, size_t *outstr_len) +{ + int i, j; + char c; + size_t column = 0; /* Screen column where next char will go */ + size_t offset_out = 0; /* Index in `line_out' for next char. */ + static char *line_out = NULL; + static size_t allocated_out = 0; + int saved_errno; + if (!desc || !name) + return 1; + + *outstr = malloc (width + + (((desc_len + width) / (width - align)) * width) * 2 + * sizeof (char)); + *outstr[0] = '\0'; + + strncat (*outstr, name, name_len); + + column = name_len; + + if (name_len > calign - 2) + { + /* Name is too long to have description on the same line. */ + if (desc_len > 1) + { + strncat (*outstr, "\n", 1); + column = 0; + for (j = 0; j < calign - 1; j++) + { + column = adjust_column (column, ' '); + strncat (*outstr, " ", 1); + } + } + } + else + for (j = 0; j < calign - name_len - 1; j++) + { + if (desc_len <= 2) + break; + column = adjust_column (column, ' '); + strncat (*outstr, " ", 1); + } + + for (i = 0; i < desc_len; i++) + { + if (desc_len <= 2) + break; + c = desc[i]; + if (offset_out + 1 >= allocated_out) + { + allocated_out = offset_out + 1; + line_out = (char *) realloc ((void *)line_out, allocated_out); + } + + if (c == '\n') + { + line_out[offset_out++] = c; + strncat (*outstr, line_out, offset_out); + column = offset_out = 0; + continue; + } + + rescan: + column = adjust_column (column, c); + + if (column > width) + { + /* This character would make the line too long. + Print the line plus a newline, and make this character + start the next line. */ + + int found_blank = 0; + size_t logical_end = offset_out; + + /* Look for the last blank. */ + while (logical_end) + { + --logical_end; + if (isblank (toupper(line_out[logical_end]))) + { + found_blank = 1; + break; + } + } + + if (found_blank) + { + size_t i; + + /* Found a blank. Don't output the part after it. */ + logical_end++; + strncat (*outstr, line_out, logical_end); + strncat (*outstr, "\n", 1); + for (j = 0; j < align - 1; j++) + { + column = adjust_column (column, ' '); + strncat (*outstr, " ", 1); + } + + /* Move the remainder to the beginning of the next + line. + The areas being copied here might overlap. */ + memmove (line_out, line_out + logical_end, + offset_out - logical_end); + offset_out -= logical_end; + for (column = i = 0; i < offset_out; i++) + column = adjust_column (column, line_out[i]); + goto rescan; + } + + if (offset_out == 0) + { + line_out[offset_out++] = c; + continue; + } + + line_out[offset_out++] = '\n'; + strncat (*outstr, line_out, offset_out); + column = offset_out = 0; + goto rescan; + } + + line_out[offset_out++] = c; + } + + saved_errno = errno; + + if (desc_len <= 2) + strncat (*outstr, "\n", 1); + + if (offset_out) + strncat (*outstr, line_out, offset_out); + + *outstr_len = strlen (*outstr); + return 1; +} + + +/* Extract the NAME and DESCRIPTION from ENTRY. NAME and DESCRIPTION must be + free'd. + */ +static void +split_entry (char *entry, char **name, size_t *name_len, char **description, size_t *description_len) +{ + FILE *ostream; + char *endptr; + + /* on the first line, the description starts after the first period. */ + char *ptr = strchr (entry, '.'); + /* Maybe there's no period, and no description */ + if (!ptr) + { + size_t length = strlen (entry); + if (length == 0) + return; + *name = strdup (ptr); + *name_len = length + 1; + return; + } + + /* The name is everything up to and including the period. */ + *name_len = (size_t) (ptr - entry + 1); + *name = xmalloc (*name_len + 1); + (*name)[0] = '\0'; + strncat (*name, entry, *name_len); + + ptr++; + *description = xmalloc (strlen (entry)); + (*description)[0] = '\0'; + + while (ptr[0] != '\0') + { + + /* Eat up the whitespace after the name, and at the start of a line. */ + while (isspace(ptr[0])) + ptr++; + + /* Okay, we're at the start of the description. */ + if (ptr[0] == '\0') + continue; + + /* See how far the description goes... */ + endptr = strchr (ptr, '\n'); + /* Either the description continues up to the next newline. */ + if (endptr) + { + size_t length = (size_t) (endptr - ptr) / sizeof (char); + strncat (*description, ptr, length); + ptr = endptr; + /* First of all, we eat the newline here. But then what? + Sometimes the newline separates 2 sentences, so we + end up with the next word starting directly after the period, + instead of after the customary 2 spaces in english. + If the previous character was a `.', then we should add 2 + spaces if there is anything on the next line. + if it's a comma, then we should put one space. + If it's neither, we just put a space. + If it's some other whitespace, we shouldn't do anything. */ + ptr++; + if (length > 1 && strlen (ptr) > 0) + { + endptr--; + /* *ENDPTR is the 2nd last character */ + if (*endptr == '.') + strncat (*description, " ", 2); + else if (!isspace (*endptr)) + strncat (*description, " ", 1); + } + } + /* Or the description continues to the end of the string. */ + else + { + /* Just show the rest when there's no newline. */ + size_t length = strlen (ptr); + strncat (*description, ptr, length); + ptr += length; + } + } + /* Descriptions end in a new line. */ + strncat (*description, "\n", 1); + *description_len = strlen (*description); } + +/* Indent all ENTRIES according to some formatting options. + CALIGN_CLI is the starting column for the first line of the description. + ALIGN_CLI is the starting column for all subsequent lines of the + description. MAXWIDTH_CLI is the number of columns in the line. + When CALIGN_CLI, ALIGN_CLI, or MAXWIDTH_CLI is -1, choose a sane default. */ + +static void +reformat_new_entries (struct spec_entry *entries, int calign_cli, int align_cli, + int maxwidth_cli) +{ + struct spec_entry *entry; + for (entry = entries; entry; entry = entry->next) + { + int calign = -1, align = -1, maxwidth = -1; + char *name = NULL, *desc = NULL; + size_t name_len = 0, desc_len = 0; + split_entry (entry->text, &name, &name_len, &desc, &desc_len); + free (entry->text); + + /* Specify sane defaults if we need to */ + if (calign_cli == -1 || align_cli == -1) + { + struct spec_section *section; + calign = calign_cli; + align = align_cli; + for (section = entry->entry_sections; + section && section != entry->entry_sections_tail; + section = section->next) + { + if (!strcmp (section->name, "Individual utilities")) + { + if (calign == -1) + calign = 48 + 1; + if (align == -1) + align = 50 + 1; + break; + } + } + if (calign == -1) + calign = 32 + 1; + if (align == -1) + align = 34 + 1; + } + else + { + calign = calign_cli; + align = align_cli; + } + + if (maxwidth_cli == -1) + maxwidth = 79; + + format_entry (name, name_len, desc, desc_len, calign, align, + maxwidth, &entry->text, &entry->text_len); + } +} + +/* Insert NAME into every entry in ENTRIES that requires it. + NAME is the basename of the Info file being installed. + The idea here is that there was a --name on the command-line + and we need to put the basename in the empty parentheses. */ +void +add_missing_basenames (struct spec_entry *entries, char *name) +{ + struct spec_entry *entry; + for (entry = entries; entry; entry = entry->next) + { + if (entry->missing_basename) + { + /* Insert NAME into the right place in ENTRY->TEXT. */ + char *info, *rest; + size_t name_len = strlen (name); + char *ptr = strstr (entry->text, ": ()."); + if (!ptr) + return; + ptr[0] = '\0'; + rest = ptr += sizeof (": ()."); + + info = xmalloc (name_len + 6); + snprintf (info, name_len + 6, ": (%s).", name); + char *text = concat (entry->text, info, rest); + free (info); + if (entry->text) + free (entry->text); + entry->text = text; + entry->text_len = strlen (entry->text); + entry->missing_name = 0; + entry->missing_basename = 0; + } + } +} + + +/* Add NAME to the start of any entry in ENTRIES that is missing a name + component. If NAME doesn't start with `*', it is formatted to look + like an Info entry. */ +void +add_missing_names (struct spec_entry *entries, char *name) +{ + struct spec_entry *entry; + for (entry = entries; entry; entry = entry->next) + { + if (entry->missing_name) + { + char *text; + /* Prepend NAME onto ENTRY->TEXT. */ + int add_nl = 1; + if (entry->text) + if (entry->text[entry->text_len - 1] == '\n') + add_nl = 0; + + if (name[0] == '*') + text = concat (name, entry->text == NULL ? "" : entry->text, + add_nl ? "\n" : ""); + else + { + size_t full_name_len = strlen (name) * 2 + 9; + char *full_name = xmalloc (full_name_len); + snprintf (full_name, full_name_len, "* %s: (%s).", name, name); + text = concat (full_name, + entry->text == NULL ? "" : entry->text, + add_nl ? "\n" : ""); + free (full_name); + } + if (entry->text) + free (entry->text); + entry->text = text; + entry->text_len = strlen (entry->text); + entry->missing_name = 0; + entry->missing_basename = 0; + } + } +} + +/* Append DESC to every entry in ENTRIES that needs it. */ + +void +add_missing_descriptions (struct spec_entry *entries, char *desc) +{ + struct spec_entry *entry; + for (entry = entries; entry; entry = entry->next) + { + if (entry->missing_description) + { + int add_nl = 1; + if (entry->text) + if (entry->text[entry->text_len - 1] == '\n') + add_nl = 0; + /* Append DESC onto ENTRY->TEXT. */ + char *text = concat (entry->text == NULL ? "" : entry->text, desc, + add_nl ? "\n" : ""); + if (entry->text) + free (entry->text); + entry->text = text; + entry->text_len = strlen (entry->text); + } + } +} + + +/* Detect old-style Debian `--section REGEX TITLE' semantics in ARGV. + When detected the options are munged to look like: + `--regex REGEX --section TITLE --add-once' + Return 1 if munging took place, return 0 if not. + Otherwise return a negative number if something went wrong. + NEW_ARGC, and NEW_ARGV are filled with the newly munged options + when munging took place. + */ +static int +munge_old_style_debian_options (int argc, char **argv, + int *new_argc, char ***new_argv) +{ + char *opt = NULL; + int i, err; + char *argz = NULL; + size_t argz_len = 0; + const char *regex, *title; + int munge = 0; + + /* Flip through the options to detect the old `--section REGEX TITLE' + syntax */ + for (i = 0; i < argc; i++) + { + if (strcmp (argv[i], "--section") == 0) + { + FILE *fileptr; + /* Go forward one arg and obtain the REGEX. */ + if (i + 1 < argc) + i++; + else + return -1; + regex = argv[i]; + /* Go forward another arg and obtain the TITLE. */ + if (i + 1 < argc) + i++; + else + return -1; + title = argv[i]; + /* When the title starts with a `-' it's probably an option, + and not a title. */ + if (title[0] == '-') + break; + /* When the title is a filename it's probably an Info file, or + a dir file, and not a title. */ + fileptr = fopen (title, "r"); + if (fileptr) + { + fclose (fileptr); + break; + } + /* Okay, it looks like we're using the old debian syntax + for --section. */ + munge = 1; + + /* Okay, we munge the options to look like this: + --regex=REGEX --section=TITLE --add-once */ + if (asprintf (&opt, "--regex=%s", regex) == -1) + err = 1; + if (!err) + err = argz_add (&argz, &argz_len, opt); + free (opt); opt = NULL; + + if (asprintf (&opt, "--section=%s", title) == -1) + err = 1; + if (!err) + err = argz_add (&argz, &argz_len, opt); + free (opt); opt = NULL; + + if (!err) + err = argz_add (&argz, &argz_len, "--add-once"); + } + else + err = argz_add (&argz, &argz_len, argv[i]); + if (err) + return -1; + } + + if (munge) + { + *new_argc = argz_count (argz, argz_len); + *new_argv = xmalloc ((*new_argc + 1) * sizeof (char *)); + + opt = NULL; i = 0; + while ((opt = argz_next (argz, argz_len, opt))) + { + (*new_argv)[i] = xstrdup (opt); + i++; + } + (*new_argv)[*new_argc] = NULL; + } + free (argz); + return munge; +} + + int main (int argc, char *argv[]) { @@ -1160,6 +1753,9 @@ char *compression_program; char *infile_sans_info; char *infile = 0, *dirfile = 0; + int calign = -1; + int align = -1; + int maxwidth = -1; /* Record the text of the Info file, as a sequence of characters and as a sequence of lines. */ @@ -1171,6 +1767,7 @@ /* Record here the specified section names and directory entries. */ struct spec_section *input_sections = NULL; struct spec_entry *entries_to_add = NULL; + struct spec_entry *entries_to_add_from_file = NULL; int n_entries_to_add = 0; /* Record the old text of the dir file, as plain characters, @@ -1202,9 +1799,12 @@ bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); + munge_old_style_debian_options (argc, argv, &argc, &argv); + while (1) { - int opt = getopt_long (argc, argv, "i:d:e:s:hHr", longopts, 0); + int opt = getopt_long (argc, argv, + "i:d:e:s:t:E:c:C:W:A:hHrk1Ia", longopts, 0); if (opt == EOF) break; @@ -1219,6 +1819,79 @@ case 1: abort (); + case '1': + add_entries_into_all_matching_sections = 0; + break; + + case 'a': + order_new_sections_alphabetically_flag = 0; + break; + + case 'A': + { + char *end = NULL; + unsigned long int val; + val = strtoul (optarg, &end, 0); + if (end == NULL || end == optarg || *end != '\0') + suggest_asking_for_help (); + align = val; + if (align <= 0) + suggest_asking_for_help (); + } + break; + + case 'c': + + { + struct spec_entry *next; + size_t length = strlen (optarg); + + if (!entries_to_add) + { + next = + (struct spec_entry *) xmalloc (sizeof (struct spec_entry)); + + next->text = NULL; + next->text_len = 0; + next->entry_sections = NULL; + next->entry_sections_tail = NULL; + next->missing_name = 1; + next->missing_basename = 1; + next->next = entries_to_add; + entries_to_add = next; + n_entries_to_add++; + } + else + next = entries_to_add; + + next->missing_description = 0; + if (next->text) + { + char *nl = strrchr (next->text, '\n'); + if (nl) + nl[0] = '\0'; + } + /* Concat the description onto the current entry, adding a + newline if we need one. */ + next->text = concat (next->text == NULL ? "" : next->text, optarg, + optarg[length - 1] == '\n' ? "" : "\n"); + next->text_len = strlen (next->text); + } + break; + + case 'C': + { + char *end = NULL; + unsigned long int val; + val = strtoul (optarg, &end, 0); + if (end == NULL || end == optarg || *end != '\0') + suggest_asking_for_help (); + calign = val; + if (calign <= 0) + suggest_asking_for_help (); + } + break; + case 'd': if (dirfile) { @@ -1239,6 +1912,44 @@ dirfile = concat (optarg, "", "/dir"); break; + case 't': + { + struct spec_entry *next + = (struct spec_entry *) xmalloc (sizeof (struct spec_entry)); + + size_t length; + if (optarg[0] != '*') + { + /* Make enough space for "* foo: ().\n". */ + length = strlen (optarg) + 9; + next->text = xmalloc (length); + snprintf (next->text, length, "* %s: ().\n", optarg); + next->missing_basename = 1; + /* The basename will be inserted in between the parentheses + at a later time. See add_missing_basenames. */ + } + else + { + /* Make enough space for "foo\n". */ + length = strlen (optarg) + 2; + next->text = xmalloc (length); + snprintf (next->text, length, "%s\n", optarg); + next->missing_basename = 0; + /* FIXME: check for info entry correctness in TEXT. + e.g. `* Aaa: (bbb).' */ + } + + next->text_len = length - 1; + next->entry_sections = NULL; + next->entry_sections_tail = NULL; + next->next = entries_to_add; + next->missing_name = 0; + next->missing_description = 1; + entries_to_add = next; + n_entries_to_add++; + } + break; + case 'e': { struct spec_entry *next @@ -1254,6 +1965,9 @@ next->entry_sections = NULL; next->entry_sections_tail = NULL; next->next = entries_to_add; + next->missing_name = 0; + next->missing_basename = 0; + next->missing_description = 0; entries_to_add = next; n_entries_to_add++; } @@ -1278,6 +1992,14 @@ infile = optarg; break; + case 'I': + indent_flag = 0; + break; + + case 'k': + keep_old_flag = 1; + break; + case 'n': chicken_flag = 1; break; @@ -1294,10 +2016,13 @@ { int error; if (psecreg) - warning (_("Extra regular expression specified, ignoring `%s'"), - optarg, 0); - else - psecreg = (regex_t *) xmalloc (sizeof (regex_t)); + { + warning + (_("Extra regular expression specified, ignoring `%s'"), + optarg, 0); + break; + } + psecreg = (regex_t *) xmalloc (sizeof (regex_t)); error = regcomp (psecreg, optarg, REG_ICASE|REG_NOSUB); if (error != 0) @@ -1332,6 +2057,19 @@ "2007"); xexit (0); + case 'W': + { + char *end = NULL; + unsigned long int val; + val = strtoul (optarg, &end, 0); + if (end == NULL || end == optarg || *end != '\0') + suggest_asking_for_help (); + maxwidth = val; + if (maxwidth <= 0) + suggest_asking_for_help (); + } + break; + case 'x': delete_flag = 1; remove_exactly = 1; @@ -1359,9 +2097,59 @@ if (!dirfile) fatal (_("No dir file specified; try --help for more information."), 0, 0); - /* Read the Info file and parse it into lines, unless we're deleting. */ + /* Now read in the Info dir file. */ + if (debug_flag) + printf ("debug: reading dir file %s\n", dirfile); + dir_data = readfile (dirfile, &dir_size, ensure_dirfile_exists, + &opened_dirfilename, &compression_program); + dir_lines = findlines (dir_data, dir_size, &dir_nlines); + + parse_dir_file (dir_lines, dir_nlines, &dir_nodes); + if (!delete_flag) { + /* Find which sections match our regular expression. */ + if (psecreg) + { + struct node *node; + struct menu_section *section; + for (node = dir_nodes; node ; node = node->next) + for (section = node->sections; section ; section = section->next) + if (regexec (psecreg, section->name, 0, NULL, 0) == 0) + { + /* we have a match! */ + struct spec_section *next = + (struct spec_section *) xmalloc + (sizeof (struct spec_section)); + next->name = section->name; + next->next = input_sections; + next->missing = 0; + input_sections = next; + } + } + + } + + /* We will be comparing the entries in the dir file against the + current filename, so need to strip off any directory prefix and/or + [.info][.gz] suffix. */ + if (!remove_exactly) { + char *infile_basename = infile + strlen (infile); + + if (HAVE_DRIVE (infile)) + infile += 2; /* get past the drive spec X: */ + + while (infile_basename > infile && !IS_SLASH (infile_basename[-1])) + infile_basename--; + + infile_sans_info = strip_info_suffix (infile_basename); + } else + infile_sans_info = xstrdup(infile); + + /* Now Read the Info file and parse it into lines, unless we're + removing exactly. */ + if (!remove_exactly) + { if (debug_flag) printf ("debug: reading input file %s\n", infile); input_data = readfile (infile, &input_size, NULL, NULL, NULL); @@ -1369,19 +2157,87 @@ } i = parse_input (input_lines, input_nlines, - &input_sections, &entries_to_add); - if (i > n_entries_to_add) - n_entries_to_add = i; - + &input_sections, &entries_to_add_from_file, delete_flag); if (!delete_flag) { + /* If there are no entries on the command-line at all, so we use the + entries found in the Info file itself (if any). */ + if (entries_to_add == NULL) + { + entries_to_add = entries_to_add_from_file; + n_entries_to_add = i; + } + /* There are entries on the command-line, and they override the entries + found in the Info file. */ + else if (entries_to_add) + { + if (entries_to_add_from_file == NULL) + { + /* No entries found in the file anyway. Fill in any + missing names with the info file's basename. We're out + of luck for any missing descriptions. */ + add_missing_names (entries_to_add, infile_sans_info); + //add_missing_descriptions (entries_to_add, "\n"); + } + else + { + /* Fill in any missing names or descriptions with what was + found in the Info file. */ + char *desc = NULL; + size_t desc_len = 0; + char *name = NULL; + size_t name_len = 0; + split_entry (entries_to_add_from_file->text, &name, &name_len, + &desc, &desc_len); + if (name) + { + /* If the name doesn't look right, bail and use the + name based on the Info file. */ + if (name[0] != '*') + add_missing_names (entries_to_add, infile_sans_info); + else + add_missing_names (entries_to_add, name); + free (name); + } + + if (desc) + { + add_missing_descriptions (entries_to_add, desc); + free (desc); + } + } + } + + /* Lastly, fill in any missing basenames that might still be hanging + around from --name options on the command-line. */ + add_missing_basenames (entries_to_add, infile_sans_info); + + /* Reformat the new entries if we're doing that. */ + if (indent_flag) + { + char *no_indent = getenv ("INSTALL_INFO_NO_INDENT"); + if (!no_indent) + reformat_new_entries (entries_to_add, calign, align, maxwidth); + } + + /* If we got no sections, default to "Miscellaneous". */ + if (input_sections == NULL) + { + input_sections = (struct spec_section *) + xmalloc (sizeof (struct spec_section)); + input_sections->name = "Miscellaneous"; + input_sections->next = NULL; + input_sections->missing = 1; + } + if (entries_to_add == 0) { /* No need to abort here, the original info file may not have the requisite Texinfo commands. This is not something an installer should have to correct (it's a problem for the maintainer), and there's no need to cause subsequent parts of `make install' to fail. */ - warning (_("no info dir entry in `%s'"), infile, 0); + if (!quiet_flag) + warning (_("no info dir entry in `%s'"), infile, 0); xexit (0); } @@ -1398,45 +2254,75 @@ { struct spec_entry *ep; - /* If we got no sections, default to "Miscellaneous". */ - if (input_sections == NULL) - { - input_sections = (struct spec_section *) - xmalloc (sizeof (struct spec_section)); - input_sections->name = "Miscellaneous"; - input_sections->next = NULL; - input_sections->missing = 1; - } for (ep = entries_to_add; ep; ep = ep->next) ep->entry_sections = input_sections; } } - /* Now read in the Info dir file. */ - if (debug_flag) - printf ("debug: reading dir file %s\n", dirfile); - dir_data = readfile (dirfile, &dir_size, ensure_dirfile_exists, - &opened_dirfilename, &compression_program); - dir_lines = findlines (dir_data, dir_size, &dir_nlines); - - /* We will be comparing the entries in the dir file against the - current filename, so need to strip off any directory prefix and/or - [.info][.gz] suffix. */ - if (!remove_exactly) { - char *infile_basename = infile + strlen (infile); - - if (HAVE_DRIVE (infile)) - infile += 2; /* get past the drive spec X: */ - - while (infile_basename > infile && !IS_SLASH (infile_basename[-1])) - infile_basename--; + if (delete_flag) + { + something_deleted = mark_entry_for_deletion (dir_lines, dir_nlines, + infile_sans_info); + if (!something_deleted && !remove_exactly) + { + struct spec_entry *entry; + for (entry = entries_to_add; entry; entry = entry->next) + { + /* If the entry came from the info file... */ + if (entry->entry_sections != NULL) + { + char *name = extract_menu_item_name (entry->text); + something_deleted = + mark_entry_for_deletion (dir_lines, dir_nlines, name); + free (name); + } + } + + if (!something_deleted) + { + struct spec_entry *entry; + for (entry = entries_to_add; entry; entry = entry->next) + { + /* If the entry came from the command-line... */ + if (entry->entry_sections == NULL) + something_deleted = + mark_entry_for_deletion (dir_lines, dir_nlines, + entry->text); + } + } + } + } + + /* Check for sections with zero entries and mark them for deletion. */ + if (delete_flag && something_deleted && !keep_old_flag) + { + struct node *node; + struct menu_section *section; + int section_empty; - infile_sans_info = strip_info_suffix (infile_basename); - } else - infile_sans_info = xstrdup(infile); + for (node = dir_nodes; node ; node = node->next) + for (section = node->sections; section ; section = section->next) + { + section_empty = 1; + for (i = section->end_line; i > section->start_line; i--) + { + if (dir_lines[i - 1].delete == 0 && + dir_lines[i - 1].size != 0) + { + section_empty = 0; + break; + } + } - something_deleted - = parse_dir_file (dir_lines, dir_nlines, &dir_nodes, infile_sans_info); + if (section_empty) + { + /* This gets rid of any trailing empty lines at the end + of the section, and the title too. */ + for (i = section->end_line; i >= section->start_line; i--) + dir_lines[i - 1].delete = 1; + } + } + } /* Decide where to add the new entries (unless --delete was used). Find the menu sections to add them in. @@ -1448,31 +2334,6 @@ struct menu_section *section; struct spec_section *spec; - for (spec = input_sections; spec; spec = spec->next) - { - int found = 0; - /* Check if the section specified (e.g. in the info file) exists */ - for (node = dir_nodes; node && found == 0; node = node->next) - for (section = node->sections; - section && found == 0; - section = section->next) - if (strcmp (spec->name, section->name) == 0) - found = 1; - - /* If it does not exist, but the user specified a regular expression, - try to find a section that matches this regex. */ - if (!found && psecreg) - for (node = dir_nodes; node && found == 0; node = node->next) - for (section = node->sections; - section && found == 0; - section = section->next) - if (regexec (psecreg, section->name, 0, NULL, 0) == 0) - { - spec->name = section->name; - spec->missing = 0; - found = 1; - } - } for (node = dir_nodes; node; node = node->next) for (section = node->sections; section; section = section->next) { @@ -1486,6 +2347,7 @@ break; if (spec) { + int entries_added = 0; int add_at_line = section->end_line; struct spec_entry *entry; /* Say we have found at least one section with this name, @@ -1522,26 +2384,105 @@ dir_lines[i].start, dir_lines[i].size) && !dir_lines[i].delete) - fatal (_("menu item `%s' already exists, for file `%s'"), - extract_menu_item_name (entry->text), - extract_menu_file_name (dir_lines[i].start)); + { + if (keep_old_flag) + { + add_at_line = -1; + break; + } + else + { + int j; + dir_lines[i].delete = 1; + for (j = i + 1; j < section->end_line; j++) + { + if (dir_lines[j].start[0] == '*') + break; + dir_lines[j].delete = 1; + } + } + } if (dir_lines[i].start[0] == '*' && menu_line_lessp (entry->text, entry->text_len, dir_lines[i].start, dir_lines[i].size)) add_at_line = i; } + if (add_at_line < 0) + continue; insert_entry_here (entry, add_at_line, dir_lines, n_entries_to_add); } } } - /* Mark the end of the Top node as the place to add any - new sections that are needed. */ + } + /* Decide where to add the new sections (unless --delete was used). + Alphabetically find the menu sections to add them before. */ + if (!delete_flag) + { + struct node *node; + struct node *top = NULL; + + /* Find the `Top' node. */ for (node = dir_nodes; node; node = node->next) if (node->name && strcmp (node->name, "Top") == 0) - dir_lines[node->end_line].add_sections_before = 1; + top = node; + + if (top) + { + struct spec_section *spec; + int found = 0; + struct line_data *target_line = NULL; + for (spec = input_sections; spec; spec = spec->next) + { + found = 0; + target_line = NULL; + if (!spec->missing) + continue; + if (order_new_sections_alphabetically_flag) + { + struct menu_section *section; + struct menu_section *prev_section = NULL; + + /* Look for the first section name that + exceeds SPEC->NAME. */ + for (section = top->sections; section ; + section = section->next) + { + found = (mbscasecmp (spec->name, section->name) < 0); + if (found) + { + /* Mark the section for addition at this point. */ + if (prev_section) + target_line = &dir_lines[prev_section->end_line]; + else + target_line = + &dir_lines[top->sections->start_line - 2]; + + break; + } + prev_section = section; + } + } + + /* When we can't put a section anywhere, we put it at the + bottom of the file. */ + if (!found) + target_line = &dir_lines[top->end_line]; + + /* Add the section to our list of sections being added + at this point of the DIR file. */ + target_line->num_sections_to_add++; + target_line->add_sections_before = + (struct spec_section **) xrealloc + (target_line->add_sections_before, + (target_line->num_sections_to_add * + sizeof (struct spec_section *))); + i = target_line->num_sections_to_add - 1; + target_line->add_sections_before[i] = spec; + } + } } if (delete_flag && !something_deleted && !quiet_flag) @@ -1587,7 +2528,8 @@ } lines[filled].start = &data[i]; lines[filled].add_entries_before = 0; - lines[filled].add_sections_before = 0; + lines[filled].add_sections_before = NULL; + lines[filled].num_sections_to_add = 0; lines[filled].delete = 0; if (filled > 0) lines[filled - 1].size @@ -1602,7 +2544,8 @@ /* Do not leave garbage in the last element. */ lines[filled].start = NULL; lines[filled].add_entries_before = NULL; - lines[filled].add_sections_before = 0; + lines[filled].add_sections_before = NULL; + lines[filled].num_sections_to_add = 0; lines[filled].delete = 0; lines[filled].size = 0; @@ -1648,7 +2591,7 @@ len2 = strlen (text2); else len2 = colon2 - text2; - return strncmp (text1, text2, len1 <= len2 ? len1 : len2); + return mbsncasecmp (text1, text2, len1 <= len2 ? len1 : len2); } /* Insert ENTRY into the add_entries_before vector diff -uNrd texinfo.orig/util/Makefile.am texinfo/util/Makefile.am --- texinfo.orig/util/Makefile.am 2007-07-29 11:11:29.000000000 -0400 +++ texinfo/util/Makefile.am 2007-12-24 19:23:29.000000000 -0500 @@ -10,6 +10,7 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +SUBDIRS = tests bin_PROGRAMS = ginstall-info texindex bin_SCRIPTS = texi2dvi texi2pdf pdftexi2dvi diff -uNrd texinfo.orig/util/tests/install-info/ii-0001-expected-dir-file texinfo/util/tests/install-info/ii-0001-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0001-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0001-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0001-input-dir-file texinfo/util/tests/install-info/ii-0001-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0001-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0001-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0001-input-info-file texinfo/util/tests/install-info/ii-0001-input-info-file --- texinfo.orig/util/tests/install-info/ii-0001-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0001-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0001-test texinfo/util/tests/install-info/ii-0001-test --- texinfo.orig/util/tests/install-info/ii-0001-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0001-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0001-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0001-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0001-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0002-expected-dir-file texinfo/util/tests/install-info/ii-0002-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0002-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0002-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. +* Wildebeest: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0002-input-dir-file texinfo/util/tests/install-info/ii-0002-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0002-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0002-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0002-input-info-file texinfo/util/tests/install-info/ii-0002-input-info-file --- texinfo.orig/util/tests/install-info/ii-0002-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0002-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,12 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Wildebeest: (gnu). Wildebeest native to Africa. +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0002-test texinfo/util/tests/install-info/ii-0002-test --- texinfo.orig/util/tests/install-info/ii-0002-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0002-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0002-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0002-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0002-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0003-expected-dir-file texinfo/util/tests/install-info/ii-0003-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0003-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0003-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. +* Wildebeest: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0003-input-dir-file texinfo/util/tests/install-info/ii-0003-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0003-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0003-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0003-input-info-file texinfo/util/tests/install-info/ii-0003-input-info-file --- texinfo.orig/util/tests/install-info/ii-0003-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0003-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,15 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +START-INFO-DIR-ENTRY +* Wildebeest: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0003-test texinfo/util/tests/install-info/ii-0003-test --- texinfo.orig/util/tests/install-info/ii-0003-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0003-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0003-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0003-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0003-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0004-expected-dir-file texinfo/util/tests/install-info/ii-0004-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0004-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0004-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,28 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. + +Antlered Animals +* Deer: (deer). Ruminent antlered mammal. +* Wildebeest: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0004-input-dir-file texinfo/util/tests/install-info/ii-0004-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0004-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0004-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,26 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Antlered Animals +* Deer: (deer). Ruminent antlered mammal. diff -uNrd texinfo.orig/util/tests/install-info/ii-0004-input-info-file texinfo/util/tests/install-info/ii-0004-input-info-file --- texinfo.orig/util/tests/install-info/ii-0004-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0004-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,16 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Wildebeest: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0004-test texinfo/util/tests/install-info/ii-0004-test --- texinfo.orig/util/tests/install-info/ii-0004-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0004-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0004-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0004-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0004-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0005-expected-dir-file texinfo/util/tests/install-info/ii-0005-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0005-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0005-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,27 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. + +Antlered Animals +* Wildebeest: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0005-input-dir-file texinfo/util/tests/install-info/ii-0005-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0005-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0005-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0005-input-info-file texinfo/util/tests/install-info/ii-0005-input-info-file --- texinfo.orig/util/tests/install-info/ii-0005-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0005-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,16 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Wildebeest: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0005-test texinfo/util/tests/install-info/ii-0005-test --- texinfo.orig/util/tests/install-info/ii-0005-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0005-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0005-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0005-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0005-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0006-expected-dir-file texinfo/util/tests/install-info/ii-0006-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0006-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0006-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0006-input-dir-file texinfo/util/tests/install-info/ii-0006-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0006-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0006-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0006-input-info-file texinfo/util/tests/install-info/ii-0006-input-info-file --- texinfo.orig/util/tests/install-info/ii-0006-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0006-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0006-test texinfo/util/tests/install-info/ii-0006-test --- texinfo.orig/util/tests/install-info/ii-0006-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0006-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0006-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0006-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0006-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0007-expected-dir-file texinfo/util/tests/install-info/ii-0007-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0007-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0007-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. +* Hippopotamus: (hippo). A large semi-aquatic African mammal. diff -uNrd texinfo.orig/util/tests/install-info/ii-0007-input-dir-file texinfo/util/tests/install-info/ii-0007-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0007-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0007-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Hippopotamus: (hippo). A large semi-aquatic African mammal. diff -uNrd texinfo.orig/util/tests/install-info/ii-0007-input-info-file texinfo/util/tests/install-info/ii-0007-input-info-file --- texinfo.orig/util/tests/install-info/ii-0007-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0007-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0007-test texinfo/util/tests/install-info/ii-0007-test --- texinfo.orig/util/tests/install-info/ii-0007-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0007-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0007-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0007-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0007-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0008-expected-dir-file texinfo/util/tests/install-info/ii-0008-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0008-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0008-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to the African + savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0008-input-dir-file texinfo/util/tests/install-info/ii-0008-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0008-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0008-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0008-input-info-file texinfo/util/tests/install-info/ii-0008-input-info-file --- texinfo.orig/util/tests/install-info/ii-0008-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0008-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,12 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to the African + savannah. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0008-test texinfo/util/tests/install-info/ii-0008-test --- texinfo.orig/util/tests/install-info/ii-0008-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0008-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,34 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0008-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0008-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0008-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0009-expected-dir-file texinfo/util/tests/install-info/ii-0009-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0009-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0009-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0009-input-dir-file texinfo/util/tests/install-info/ii-0009-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0009-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0009-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0009-input-info-file texinfo/util/tests/install-info/ii-0009-input-info-file --- texinfo.orig/util/tests/install-info/ii-0009-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0009-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0009-test texinfo/util/tests/install-info/ii-0009-test --- texinfo.orig/util/tests/install-info/ii-0009-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0009-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0009-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0009-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0009-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0010-expected-dir-file texinfo/util/tests/install-info/ii-0010-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0010-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0010-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to the African + savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0010-input-dir-file texinfo/util/tests/install-info/ii-0010-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0010-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0010-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0010-input-info-file texinfo/util/tests/install-info/ii-0010-input-info-file --- texinfo.orig/util/tests/install-info/ii-0010-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0010-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to the African savannah. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0010-test texinfo/util/tests/install-info/ii-0010-test --- texinfo.orig/util/tests/install-info/ii-0010-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0010-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,34 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0010-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0010-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0010-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0011-expected-dir-file texinfo/util/tests/install-info/ii-0011-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0011-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0011-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0011-input-dir-file texinfo/util/tests/install-info/ii-0011-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0011-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0011-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0011-input-info-file texinfo/util/tests/install-info/ii-0011-input-info-file --- texinfo.orig/util/tests/install-info/ii-0011-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0011-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to the African savannah. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0011-test texinfo/util/tests/install-info/ii-0011-test --- texinfo.orig/util/tests/install-info/ii-0011-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0011-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0011-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --no-indent ${testdir}/ii-0011-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0011-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0012-expected-dir-file texinfo/util/tests/install-info/ii-0012-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0012-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0012-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to the African + savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0012-input-dir-file texinfo/util/tests/install-info/ii-0012-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0012-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0012-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0012-input-info-file texinfo/util/tests/install-info/ii-0012-input-info-file --- texinfo.orig/util/tests/install-info/ii-0012-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0012-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to the African savannah. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0012-test texinfo/util/tests/install-info/ii-0012-test --- texinfo.orig/util/tests/install-info/ii-0012-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0012-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0012-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0012-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0012-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0013-expected-dir-file texinfo/util/tests/install-info/ii-0013-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0013-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0013-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0013-input-dir-file texinfo/util/tests/install-info/ii-0013-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0013-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0013-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0013-input-info-file texinfo/util/tests/install-info/ii-0013-input-info-file --- texinfo.orig/util/tests/install-info/ii-0013-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0013-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0013-test texinfo/util/tests/install-info/ii-0013-test --- texinfo.orig/util/tests/install-info/ii-0013-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0013-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0013-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --keep-old ${testdir}/ii-0013-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0013-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0014-expected-dir-file texinfo/util/tests/install-info/ii-0014-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0014-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0014-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0014-input-dir-file texinfo/util/tests/install-info/ii-0014-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0014-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0014-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). A large hooved Wildebeest native to the + African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0014-input-info-file texinfo/util/tests/install-info/ii-0014-input-info-file --- texinfo.orig/util/tests/install-info/ii-0014-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0014-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0014-test texinfo/util/tests/install-info/ii-0014-test --- texinfo.orig/util/tests/install-info/ii-0014-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0014-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0014-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0014-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0014-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0015-expected-dir-file texinfo/util/tests/install-info/ii-0015-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0015-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0015-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Large hooved animal native to the African + savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0015-input-dir-file texinfo/util/tests/install-info/ii-0015-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0015-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0015-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0015-input-info-file texinfo/util/tests/install-info/ii-0015-input-info-file --- texinfo.orig/util/tests/install-info/ii-0015-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0015-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,12 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Large hooved animal native to the African + savannah. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0015-test texinfo/util/tests/install-info/ii-0015-test --- texinfo.orig/util/tests/install-info/ii-0015-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0015-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0015-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0015-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0015-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0016-expected-dir-file texinfo/util/tests/install-info/ii-0016-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0016-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0016-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0016-input-dir-file texinfo/util/tests/install-info/ii-0016-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0016-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0016-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0016-input-info-file texinfo/util/tests/install-info/ii-0016-input-info-file --- texinfo.orig/util/tests/install-info/ii-0016-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0016-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0016-test texinfo/util/tests/install-info/ii-0016-test --- texinfo.orig/util/tests/install-info/ii-0016-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0016-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0016-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --silent ${testdir}/ii-0016-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0016-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0017-expected-dir-file texinfo/util/tests/install-info/ii-0017-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0017-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0017-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,18 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0017-input-dir-file texinfo/util/tests/install-info/ii-0017-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0017-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0017-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,15 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: diff -uNrd texinfo.orig/util/tests/install-info/ii-0017-input-info-file texinfo/util/tests/install-info/ii-0017-input-info-file --- texinfo.orig/util/tests/install-info/ii-0017-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0017-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0017-test texinfo/util/tests/install-info/ii-0017-test --- texinfo.orig/util/tests/install-info/ii-0017-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0017-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0017-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0017-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0017-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0018-input-info-file texinfo/util/tests/install-info/ii-0018-input-info-file --- texinfo.orig/util/tests/install-info/ii-0018-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0018-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0018-test texinfo/util/tests/install-info/ii-0018-test --- texinfo.orig/util/tests/install-info/ii-0018-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0018-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,30 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0018-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0018-input-info-file $outputdirfile 2>/dev/null +retval=$? +if [ "x$retval" != "x1" ]; then + exit $retval +fi + +rm -f $outputdirfile +exit 0 diff -uNrd texinfo.orig/util/tests/install-info/ii-0019-input-dir-file texinfo/util/tests/install-info/ii-0019-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0019-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0019-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,2 @@ + + diff -uNrd texinfo.orig/util/tests/install-info/ii-0019-input-info-file texinfo/util/tests/install-info/ii-0019-input-info-file --- texinfo.orig/util/tests/install-info/ii-0019-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0019-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0019-test texinfo/util/tests/install-info/ii-0019-test --- texinfo.orig/util/tests/install-info/ii-0019-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0019-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,30 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0019-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0019-input-info-file $outputdirfile 2>/dev/null +retval=$? +if [ "x$retval" != "x1" ]; then + exit $retval +fi + +rm -f $outputdirfile +exit 0 diff -uNrd texinfo.orig/util/tests/install-info/ii-0020-expected-dir-file texinfo/util/tests/install-info/ii-0020-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0020-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0020-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,27 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Miscellaneous +* ii-0020-input-info-file: (ii-0020-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0020-input-dir-file texinfo/util/tests/install-info/ii-0020-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0020-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0020-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0020-input-info-file texinfo/util/tests/install-info/ii-0020-input-info-file --- texinfo.orig/util/tests/install-info/ii-0020-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0020-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0020-test texinfo/util/tests/install-info/ii-0020-test --- texinfo.orig/util/tests/install-info/ii-0020-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0020-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,32 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0020-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi +${install_info} --description='Wildebeest native to Africa.' ${testdir}/ii-0020-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0020-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0021-expected-dir-file texinfo/util/tests/install-info/ii-0021-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0021-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0021-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* ii-0021-input-info-file: (ii-0021-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0021-input-dir-file texinfo/util/tests/install-info/ii-0021-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0021-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0021-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0021-input-info-file texinfo/util/tests/install-info/ii-0021-input-info-file --- texinfo.orig/util/tests/install-info/ii-0021-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0021-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0021-test texinfo/util/tests/install-info/ii-0021-test --- texinfo.orig/util/tests/install-info/ii-0021-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0021-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,32 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0021-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi +${install_info} --section="Animals" --description='Wildebeest native to Africa.' ${testdir}/ii-0021-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0021-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0022-expected-dir-file texinfo/util/tests/install-info/ii-0022-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0022-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0022-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,27 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Hippopotamus: (hippo). A large semi-aquatic African mammal. + +Miscellaneous +* Gnu: (gnu). diff -uNrd texinfo.orig/util/tests/install-info/ii-0022-input-dir-file texinfo/util/tests/install-info/ii-0022-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0022-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0022-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Hippopotamus: (hippo). A large semi-aquatic African mammal. diff -uNrd texinfo.orig/util/tests/install-info/ii-0022-input-info-file texinfo/util/tests/install-info/ii-0022-input-info-file --- texinfo.orig/util/tests/install-info/ii-0022-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0022-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0022-test texinfo/util/tests/install-info/ii-0022-test --- texinfo.orig/util/tests/install-info/ii-0022-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0022-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0022-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name='* Gnu: (gnu).' ${testdir}/ii-0022-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0022-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0023-expected-dir-file texinfo/util/tests/install-info/ii-0023-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0023-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0023-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,26 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Miscellaneous +* Gnu: (ii-0023-input-info-file). diff -uNrd texinfo.orig/util/tests/install-info/ii-0023-input-dir-file texinfo/util/tests/install-info/ii-0023-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0023-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0023-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0023-input-info-file texinfo/util/tests/install-info/ii-0023-input-info-file --- texinfo.orig/util/tests/install-info/ii-0023-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0023-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0023-test texinfo/util/tests/install-info/ii-0023-test --- texinfo.orig/util/tests/install-info/ii-0023-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0023-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0023-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name="Gnu" ${testdir}/ii-0023-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0023-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0024-expected-dir-file texinfo/util/tests/install-info/ii-0024-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0024-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0024-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,26 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Antlered Animals +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0024-input-dir-file texinfo/util/tests/install-info/ii-0024-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0024-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0024-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0024-input-info-file texinfo/util/tests/install-info/ii-0024-input-info-file --- texinfo.orig/util/tests/install-info/ii-0024-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0024-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0024-test texinfo/util/tests/install-info/ii-0024-test --- texinfo.orig/util/tests/install-info/ii-0024-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0024-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0024-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --section="Antlered Animals" ${testdir}/ii-0024-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0024-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0025-expected-dir-file texinfo/util/tests/install-info/ii-0025-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0025-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0025-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0025-input-dir-file texinfo/util/tests/install-info/ii-0025-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0025-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0025-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0025-input-info-file texinfo/util/tests/install-info/ii-0025-input-info-file --- texinfo.orig/util/tests/install-info/ii-0025-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0025-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0025-test texinfo/util/tests/install-info/ii-0025-test --- texinfo.orig/util/tests/install-info/ii-0025-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0025-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0025-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --section="Animals" ${testdir}/ii-0025-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0025-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0026-expected-dir-file texinfo/util/tests/install-info/ii-0026-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0026-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0026-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0026-input-dir-file texinfo/util/tests/install-info/ii-0026-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0026-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0026-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0026-input-info-file texinfo/util/tests/install-info/ii-0026-input-info-file --- texinfo.orig/util/tests/install-info/ii-0026-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0026-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0026-test texinfo/util/tests/install-info/ii-0026-test --- texinfo.orig/util/tests/install-info/ii-0026-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0026-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0026-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --entry="* Gnu: (gnu). Wildebeest native to the African savannah." ${testdir}/ii-0026-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0026-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0027-expected-dir-file texinfo/util/tests/install-info/ii-0027-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0027-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0027-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,26 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Antlered Animals +* Gnu: (gnu). Wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0027-input-dir-file texinfo/util/tests/install-info/ii-0027-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0027-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0027-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0027-input-info-file texinfo/util/tests/install-info/ii-0027-input-info-file --- texinfo.orig/util/tests/install-info/ii-0027-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0027-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0027-test texinfo/util/tests/install-info/ii-0027-test --- texinfo.orig/util/tests/install-info/ii-0027-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0027-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0027-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --entry="* Gnu: (gnu). Wildebeest native to the African savannah." --section="Antlered Animals" ${testdir}/ii-0027-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0027-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0028-expected-dir-file texinfo/util/tests/install-info/ii-0028-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0028-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0028-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Wildebeest: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0028-input-dir-file texinfo/util/tests/install-info/ii-0028-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0028-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0028-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0028-input-info-file texinfo/util/tests/install-info/ii-0028-input-info-file --- texinfo.orig/util/tests/install-info/ii-0028-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0028-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0028-test texinfo/util/tests/install-info/ii-0028-test --- texinfo.orig/util/tests/install-info/ii-0028-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0028-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0028-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name="* Wildebeest: (gnu)." ${testdir}/ii-0028-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0028-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0029-expected-dir-file texinfo/util/tests/install-info/ii-0029-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0029-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0029-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Wildebeest: (ii-0029-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0029-input-dir-file texinfo/util/tests/install-info/ii-0029-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0029-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0029-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0029-input-info-file texinfo/util/tests/install-info/ii-0029-input-info-file --- texinfo.orig/util/tests/install-info/ii-0029-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0029-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0029-test texinfo/util/tests/install-info/ii-0029-test --- texinfo.orig/util/tests/install-info/ii-0029-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0029-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0029-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name="Wildebeest" ${testdir}/ii-0029-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0029-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0030-expected-dir-file texinfo/util/tests/install-info/ii-0030-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0030-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0030-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0030-input-dir-file texinfo/util/tests/install-info/ii-0030-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0030-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0030-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0030-input-info-file texinfo/util/tests/install-info/ii-0030-input-info-file --- texinfo.orig/util/tests/install-info/ii-0030-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0030-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0030-test texinfo/util/tests/install-info/ii-0030-test --- texinfo.orig/util/tests/install-info/ii-0030-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0030-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0030-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --description="Wildebeest native to the African savannah." ${testdir}/ii-0030-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0030-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0031-expected-dir-file texinfo/util/tests/install-info/ii-0031-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0031-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0031-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Wildebeest: (gnu). Wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0031-input-dir-file texinfo/util/tests/install-info/ii-0031-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0031-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0031-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0031-input-info-file texinfo/util/tests/install-info/ii-0031-input-info-file --- texinfo.orig/util/tests/install-info/ii-0031-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0031-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0031-test texinfo/util/tests/install-info/ii-0031-test --- texinfo.orig/util/tests/install-info/ii-0031-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0031-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0031-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name="* Wildebeest: (gnu)." --description="Wildebeest native to the African savannah." ${testdir}/ii-0031-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0031-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0032-expected-dir-file texinfo/util/tests/install-info/ii-0032-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0032-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0032-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0032-input-dir-file texinfo/util/tests/install-info/ii-0032-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0032-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0032-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0032-input-info-file texinfo/util/tests/install-info/ii-0032-input-info-file --- texinfo.orig/util/tests/install-info/ii-0032-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0032-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0032-test texinfo/util/tests/install-info/ii-0032-test --- texinfo.orig/util/tests/install-info/ii-0032-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0032-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0032-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --regex='^Antlered Animals$' ${testdir}/ii-0032-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0032-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0033-expected-dir-file texinfo/util/tests/install-info/ii-0033-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0033-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0033-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,26 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. + +Miscellaneous +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0033-input-dir-file texinfo/util/tests/install-info/ii-0033-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0033-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0033-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0033-input-info-file texinfo/util/tests/install-info/ii-0033-input-info-file --- texinfo.orig/util/tests/install-info/ii-0033-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0033-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,10 @@ +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0033-test texinfo/util/tests/install-info/ii-0033-test --- texinfo.orig/util/tests/install-info/ii-0033-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0033-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0033-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --regex='^Antlered Animals$' ${testdir}/ii-0033-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0033-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0034-expected-dir-file texinfo/util/tests/install-info/ii-0034-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0034-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0034-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0034-input-dir-file texinfo/util/tests/install-info/ii-0034-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0034-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0034-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0034-input-info-file texinfo/util/tests/install-info/ii-0034-input-info-file --- texinfo.orig/util/tests/install-info/ii-0034-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0034-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,10 @@ +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0034-test texinfo/util/tests/install-info/ii-0034-test --- texinfo.orig/util/tests/install-info/ii-0034-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0034-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0034-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --regex='^Antlered Animals$' --section="Animals" ${testdir}/ii-0034-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0034-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0035-expected-dir-file texinfo/util/tests/install-info/ii-0035-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0035-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0035-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0035-input-dir-file texinfo/util/tests/install-info/ii-0035-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0035-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0035-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0035-input-info-file texinfo/util/tests/install-info/ii-0035-input-info-file --- texinfo.orig/util/tests/install-info/ii-0035-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0035-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0035-test texinfo/util/tests/install-info/ii-0035-test --- texinfo.orig/util/tests/install-info/ii-0035-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0035-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0035-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --regex='^Antlered Animals$' --section="Animals" ${testdir}/ii-0035-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0035-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0036-expected-dir-file texinfo/util/tests/install-info/ii-0036-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0036-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0036-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0036-input-dir-file texinfo/util/tests/install-info/ii-0036-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0036-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0036-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0036-input-info-file texinfo/util/tests/install-info/ii-0036-input-info-file --- texinfo.orig/util/tests/install-info/ii-0036-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0036-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0036-test texinfo/util/tests/install-info/ii-0036-test --- texinfo.orig/util/tests/install-info/ii-0036-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0036-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0036-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --regex='[Aa]nimal[s]' ${testdir}/ii-0036-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0036-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0037-expected-dir-file texinfo/util/tests/install-info/ii-0037-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0037-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0037-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0037-input-dir-file texinfo/util/tests/install-info/ii-0037-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0037-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0037-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0037-input-info-file texinfo/util/tests/install-info/ii-0037-input-info-file --- texinfo.orig/util/tests/install-info/ii-0037-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0037-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Antlered Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0037-test texinfo/util/tests/install-info/ii-0037-test --- texinfo.orig/util/tests/install-info/ii-0037-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0037-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0037-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --section '^Antlered Animals$' Animals ${testdir}/ii-0037-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0037-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0038-expected-dir-file texinfo/util/tests/install-info/ii-0038-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0038-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0038-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,29 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. +* Wildebeest: (gnu). Wildebeest native to the African savannah. + +Antlered Animals +* Gnu: (gnu). Wildebeest native to Africa. +* Wildebeest: (gnu). Wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0038-input-dir-file texinfo/util/tests/install-info/ii-0038-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0038-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0038-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0038-input-info-file texinfo/util/tests/install-info/ii-0038-input-info-file --- texinfo.orig/util/tests/install-info/ii-0038-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0038-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,7 @@ + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0038-test texinfo/util/tests/install-info/ii-0038-test --- texinfo.orig/util/tests/install-info/ii-0038-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0038-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0038-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --section="Animals" --section="Antlered Animals" --entry="* Gnu: (gnu). Wildebeest native to Africa." --entry="* Wildebeest: (gnu). Wildebeest native to the African savannah." ${testdir}/ii-0038-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0038-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0039-expected-dir-file texinfo/util/tests/install-info/ii-0039-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0039-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0039-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to the African continent. + (this item contains disputed material). diff -uNrd texinfo.orig/util/tests/install-info/ii-0039-input-dir-file texinfo/util/tests/install-info/ii-0039-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0039-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0039-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0039-input-info-file texinfo/util/tests/install-info/ii-0039-input-info-file --- texinfo.orig/util/tests/install-info/ii-0039-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0039-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0039-test texinfo/util/tests/install-info/ii-0039-test --- texinfo.orig/util/tests/install-info/ii-0039-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0039-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,34 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0039-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --entry="* Gnu: (gnu). Wildebeest native to the African continent. + (this item contains disputed material)." --no-indent ${testdir}/ii-0039-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0039-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0040-expected-dir-file texinfo/util/tests/install-info/ii-0040-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0040-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0040-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu).A wildebeest native to the African savannah. diff -uNrd texinfo.orig/util/tests/install-info/ii-0040-input-dir-file texinfo/util/tests/install-info/ii-0040-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0040-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0040-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0040-input-info-file texinfo/util/tests/install-info/ii-0040-input-info-file --- texinfo.orig/util/tests/install-info/ii-0040-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0040-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0040-test texinfo/util/tests/install-info/ii-0040-test --- texinfo.orig/util/tests/install-info/ii-0040-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0040-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0040-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --name="* Gnu: (gnu)." --description="A wildebeest native to the African savannah." --no-indent ${testdir}/ii-0040-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0040-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0041-input-info-file texinfo/util/tests/install-info/ii-0041-input-info-file --- texinfo.orig/util/tests/install-info/ii-0041-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0041-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0041-test texinfo/util/tests/install-info/ii-0041-test --- texinfo.orig/util/tests/install-info/ii-0041-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0041-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `zdiff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp`.gz +cp ${testdir}/ii-0041-input-dir-file.gz $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0041-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +zdiff ${testdir}/ii-0041-expected-dir-file.gz $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0042-expected-dir-file texinfo/util/tests/install-info/ii-0042-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0042-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0042-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,29 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animal Kingdom +* Gnu: (gnu). Wildebeest native to Africa. + +Animalia +* Gnu: (gnu). Wildebeest native to Africa. + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0042-input-dir-file texinfo/util/tests/install-info/ii-0042-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0042-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0042-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0042-input-info-file texinfo/util/tests/install-info/ii-0042-input-info-file --- texinfo.orig/util/tests/install-info/ii-0042-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0042-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,15 @@ +INFO-DIR-SECTION Animalia +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY +INFO-DIR-SECTION Animal Kingdom +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0042-test texinfo/util/tests/install-info/ii-0042-test --- texinfo.orig/util/tests/install-info/ii-0042-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0042-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0042-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0042-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0042-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0043-expected-dir-file texinfo/util/tests/install-info/ii-0043-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0043-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0043-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,46 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Astronomy +* Mars: (mars). Postcards from the Red Planet. + +Biology +* Alien Autopsy: (mars). A biological account of an alien autopsy. + +Chemistry +* Making Gold: (gold). How to turn lead into gold. + +Dentistry +* On the Cheap: (dentistry). Do it yourself dentistry made easy. + +Education +* Dog Training: (dogs). Teaching old dogs new tricks. + +Forestry +* The Last Tree: (forest). Clear cutting practises in North America. + +Geography +* The Dark Continent (africa). A complete and total history. + +History +* The Fall of Proprietary Software: (gnu). + How the world came to reject slavery. + +Immunology +* Beating the flu: (flu). Three simple steps to beating influenza. + +Jekyllism +* Science Gone Mad (hyde). A personal account of self-medication. diff -uNrd texinfo.orig/util/tests/install-info/ii-0043-input-dir-file texinfo/util/tests/install-info/ii-0043-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0043-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0043-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,43 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Astronomy +* Mars: (mars). Postcards from the Red Planet. + +Biology +* Alien Autopsy: (mars). A biological account of an alien autopsy. + +Chemistry +* Making Gold: (gold). How to turn lead into gold. + +Dentistry +* On the Cheap: (dentistry). Do it yourself dentistry made easy. + +Education +* Dog Training: (dogs). Teaching old dogs new tricks. + +Forestry +* The Last Tree: (forest). Clear cutting practises in North America. + +History +* The Fall of Proprietary Software: (gnu). + How the world came to reject slavery. + +Immunology +* Beating the flu: (flu). Three simple steps to beating influenza. + +Jekyllism +* Science Gone Mad (hyde). A personal account of self-medication. diff -uNrd texinfo.orig/util/tests/install-info/ii-0043-input-info-file texinfo/util/tests/install-info/ii-0043-input-info-file --- texinfo.orig/util/tests/install-info/ii-0043-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0043-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Geography +START-INFO-DIR-ENTRY +* The Dark Continent (africa). A complete and total history. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0043-test texinfo/util/tests/install-info/ii-0043-test --- texinfo.orig/util/tests/install-info/ii-0043-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0043-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0043-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} ${testdir}/ii-0043-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0043-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0044-expected-dir-file texinfo/util/tests/install-info/ii-0044-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0044-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0044-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0044-input-dir-file texinfo/util/tests/install-info/ii-0044-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0044-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0044-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,25 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (ii-0044-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0044-input-info-file texinfo/util/tests/install-info/ii-0044-input-info-file --- texinfo.orig/util/tests/install-info/ii-0044-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0044-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0044-test texinfo/util/tests/install-info/ii-0044-test --- texinfo.orig/util/tests/install-info/ii-0044-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0044-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0044-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove ${testdir}/ii-0044-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0044-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0045-expected-dir-file texinfo/util/tests/install-info/ii-0045-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0045-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0045-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0045-input-dir-file texinfo/util/tests/install-info/ii-0045-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0045-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0045-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,27 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (ii-0045-input-info-file). + Wildebeest native to Africa. +* Wildebesst: (ii-0045-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0045-input-info-file texinfo/util/tests/install-info/ii-0045-input-info-file --- texinfo.orig/util/tests/install-info/ii-0045-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0045-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,12 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +* Wildebeest: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0045-test texinfo/util/tests/install-info/ii-0045-test --- texinfo.orig/util/tests/install-info/ii-0045-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0045-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0045-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove ${testdir}/ii-0045-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0045-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0046-expected-dir-file texinfo/util/tests/install-info/ii-0046-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0046-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0046-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0046-input-dir-file texinfo/util/tests/install-info/ii-0046-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0046-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0046-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,24 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. +* Gnu: (gnu). Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0046-test texinfo/util/tests/install-info/ii-0046-test --- texinfo.orig/util/tests/install-info/ii-0046-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0046-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0046-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove-exactly gnu $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0046-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0047-expected-dir-file texinfo/util/tests/install-info/ii-0047-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0047-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0047-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,16 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + diff -uNrd texinfo.orig/util/tests/install-info/ii-0047-input-dir-file texinfo/util/tests/install-info/ii-0047-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0047-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0047-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,19 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Gnu: (ii-0047-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0047-input-info-file texinfo/util/tests/install-info/ii-0047-input-info-file --- texinfo.orig/util/tests/install-info/ii-0047-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0047-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0047-test texinfo/util/tests/install-info/ii-0047-test --- texinfo.orig/util/tests/install-info/ii-0047-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0047-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0047-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove ${testdir}/ii-0047-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0047-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0048-expected-dir-file texinfo/util/tests/install-info/ii-0048-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0048-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0048-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,17 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals diff -uNrd texinfo.orig/util/tests/install-info/ii-0048-input-dir-file texinfo/util/tests/install-info/ii-0048-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0048-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0048-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,19 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Gnu: (ii-0048-input-info-file). + Wildebeest native to Africa. diff -uNrd texinfo.orig/util/tests/install-info/ii-0048-input-info-file texinfo/util/tests/install-info/ii-0048-input-info-file --- texinfo.orig/util/tests/install-info/ii-0048-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0048-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0048-test texinfo/util/tests/install-info/ii-0048-test --- texinfo.orig/util/tests/install-info/ii-0048-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0048-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0048-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove --keep-old ${testdir}/ii-0048-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0048-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0049-expected-dir-file texinfo/util/tests/install-info/ii-0049-expected-dir-file --- texinfo.orig/util/tests/install-info/ii-0049-expected-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0049-expected-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0049-input-dir-file texinfo/util/tests/install-info/ii-0049-input-dir-file --- texinfo.orig/util/tests/install-info/ii-0049-input-dir-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0049-input-dir-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,23 @@ +This is the directory file `dir' a.k.a. `DIR', which contains the + topmost node of the Info hierarchy. + + +File: dir, Node: Top, This is the top of the INFO tree. + +This is the Info main menu (aka directory node). +A few useful Info commands: + + `q' quits; + `?' lists all Info commands; + `h' starts the Info tutorial; + `mTexinfo RET' visits the Texinfo manual, etc. + +* Menu: + +Animals +* Aardvark: (aardvark). Medium-sized African mammal. +* Baboon: (baboon). A monkey from Africa. +* Chameleon: (chameleon). A lizard from Africa. +* Deer: (deer). Ruminent antlered mammal. +* Emu: (emu). A flightless bird from Australia. +* Fisher: (fisher). A marten from North America. diff -uNrd texinfo.orig/util/tests/install-info/ii-0049-input-info-file texinfo/util/tests/install-info/ii-0049-input-info-file --- texinfo.orig/util/tests/install-info/ii-0049-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0049-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0049-test texinfo/util/tests/install-info/ii-0049-test --- texinfo.orig/util/tests/install-info/ii-0049-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0049-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `diff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp` +cp ${testdir}/ii-0049-input-dir-file $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove ${testdir}/ii-0049-input-info-file $outputdirfile 2>/dev/null +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +diff ${testdir}/ii-0049-expected-dir-file $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/ii-0050-input-info-file texinfo/util/tests/install-info/ii-0050-input-info-file --- texinfo.orig/util/tests/install-info/ii-0050-input-info-file 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0050-input-info-file 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,11 @@ +INFO-DIR-SECTION Animals +START-INFO-DIR-ENTRY +* Gnu: (gnu). Wildebeest native to Africa. +END-INFO-DIR-ENTRY + +File: gnu, Node: Top, Next: Top, Up: (dir) + +Gnu +*** + +The wildebeest (plural, wildebeest or wildebeests), also called the gnu (pronounced /ˈnuː/ or /ˈnjuː/), is an antelope of the genus Connochaetes. It is a hooved (ungulate) mammal. (Taken from wikepedia.) diff -uNrd texinfo.orig/util/tests/install-info/ii-0050-test texinfo/util/tests/install-info/ii-0050-test --- texinfo.orig/util/tests/install-info/ii-0050-test 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/ii-0050-test 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,33 @@ +#!/bin/sh +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +#This script requires `mktemp' and `zdiff' and is designed to be run from +#a Makefile. + +#testdir and install_info come from Makefile.am and are equivalent to: +#install_info=${top_builddir}/util/ginstall-info +#testdir=${top_srcdir}/util/tests/install-info + +outputdirfile=`mktemp`.gz +cp ${testdir}/ii-0050-input-dir-file.gz $outputdirfile +if [ "x$?" != "x0" ]; then + exit 1 +fi + +${install_info} --remove ${testdir}/ii-0050-input-info-file $outputdirfile +retval=$? +if [ "x$retval" != "x0" ]; then + exit $retval +fi + +zdiff ${testdir}/ii-0050-expected-dir-file.gz $outputdirfile +retval=$? + +rm -f $outputdirfile +exit $retval diff -uNrd texinfo.orig/util/tests/install-info/Makefile.am texinfo/util/tests/install-info/Makefile.am --- texinfo.orig/util/tests/install-info/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/Makefile.am 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,230 @@ +# Makefile.am for texinfo/util/tests/install-info. +# Run automake in ../../../ to produce Makefile.in from this. +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +export top_srcdir +export top_builddir +install_info=${top_builddir}/util/ginstall-info +testdir=${top_srcdir}/util/tests/install-info +export install_info +export testdir + +TESTS=ii-0001-test ii-0002-test ii-0003-test ii-0004-test ii-0005-test \ +ii-0006-test ii-0007-test ii-0008-test ii-0009-test ii-0010-test \ +ii-0011-test ii-0012-test ii-0013-test ii-0014-test ii-0015-test \ +ii-0016-test ii-0017-test ii-0018-test ii-0019-test ii-0020-test \ +ii-0021-test ii-0022-test ii-0023-test ii-0024-test ii-0025-test \ +ii-0026-test ii-0027-test ii-0028-test ii-0029-test ii-0030-test \ +ii-0031-test ii-0032-test ii-0033-test ii-0034-test ii-0035-test \ +ii-0036-test ii-0037-test ii-0038-test ii-0039-test ii-0040-test \ +ii-0041-test ii-0042-test ii-0043-test ii-0044-test ii-0045-test \ +ii-0046-test ii-0047-test ii-0048-test ii-0049-test ii-0050-test + +noinst_SCRIPTS=$(TESTS) + +EXTRA_DIST=\ +ii-0001-input-dir-file \ +ii-0001-input-info-file \ +ii-0001-expected-dir-file \ +ii-0001-test \ +ii-0002-input-dir-file \ +ii-0002-input-info-file \ +ii-0002-expected-dir-file \ +ii-0002-test \ +ii-0003-input-dir-file \ +ii-0003-input-info-file \ +ii-0003-expected-dir-file \ +ii-0003-test \ +ii-0004-input-dir-file \ +ii-0004-input-info-file \ +ii-0004-expected-dir-file \ +ii-0004-test \ +ii-0005-input-dir-file \ +ii-0005-input-info-file \ +ii-0005-expected-dir-file \ +ii-0005-test \ +ii-0006-input-dir-file \ +ii-0006-input-info-file \ +ii-0006-expected-dir-file \ +ii-0006-test \ +ii-0007-input-dir-file \ +ii-0007-input-info-file \ +ii-0007-expected-dir-file \ +ii-0007-test \ +ii-0008-input-dir-file \ +ii-0008-input-info-file \ +ii-0008-expected-dir-file \ +ii-0008-test \ +ii-0009-input-dir-file \ +ii-0009-input-info-file \ +ii-0009-expected-dir-file \ +ii-0009-test \ +ii-0010-input-dir-file \ +ii-0010-input-info-file \ +ii-0010-expected-dir-file \ +ii-0010-test \ +ii-0011-input-dir-file \ +ii-0011-input-info-file \ +ii-0011-expected-dir-file \ +ii-0011-test \ +ii-0012-input-dir-file \ +ii-0012-input-info-file \ +ii-0012-expected-dir-file \ +ii-0012-test \ +ii-0013-input-dir-file \ +ii-0013-input-info-file \ +ii-0013-expected-dir-file \ +ii-0013-test \ +ii-0014-input-dir-file \ +ii-0014-input-info-file \ +ii-0014-expected-dir-file \ +ii-0014-test \ +ii-0015-input-dir-file \ +ii-0015-input-info-file \ +ii-0015-expected-dir-file \ +ii-0015-test \ +ii-0016-input-dir-file \ +ii-0016-input-info-file \ +ii-0016-expected-dir-file \ +ii-0016-test \ +ii-0017-input-dir-file \ +ii-0017-input-info-file \ +ii-0017-expected-dir-file \ +ii-0017-test \ +ii-0018-input-dir-file \ +ii-0018-input-info-file \ +ii-0018-test \ +ii-0019-input-dir-file \ +ii-0019-input-info-file \ +ii-0019-test \ +ii-0020-input-dir-file \ +ii-0020-input-info-file \ +ii-0020-expected-dir-file \ +ii-0020-test \ +ii-0021-input-dir-file \ +ii-0021-input-info-file \ +ii-0021-expected-dir-file \ +ii-0021-test \ +ii-0022-input-dir-file \ +ii-0022-input-info-file \ +ii-0022-expected-dir-file \ +ii-0022-test \ +ii-0023-input-dir-file \ +ii-0023-input-info-file \ +ii-0023-expected-dir-file \ +ii-0023-test \ +ii-0024-input-dir-file \ +ii-0024-input-info-file \ +ii-0024-expected-dir-file \ +ii-0024-test \ +ii-0025-input-dir-file \ +ii-0025-input-info-file \ +ii-0025-expected-dir-file \ +ii-0025-test \ +ii-0026-input-dir-file \ +ii-0026-input-info-file \ +ii-0026-expected-dir-file \ +ii-0026-test \ +ii-0027-input-dir-file \ +ii-0027-input-info-file \ +ii-0027-expected-dir-file \ +ii-0027-test \ +ii-0028-input-dir-file \ +ii-0028-input-info-file \ +ii-0028-expected-dir-file \ +ii-0028-test \ +ii-0029-input-dir-file \ +ii-0029-input-info-file \ +ii-0029-expected-dir-file \ +ii-0029-test \ +ii-0030-input-dir-file \ +ii-0030-input-info-file \ +ii-0030-expected-dir-file \ +ii-0030-test \ +ii-0031-input-dir-file \ +ii-0031-input-info-file \ +ii-0031-expected-dir-file \ +ii-0031-test \ +ii-0032-input-dir-file \ +ii-0032-input-info-file \ +ii-0032-expected-dir-file \ +ii-0032-test \ +ii-0033-input-dir-file \ +ii-0033-input-info-file \ +ii-0033-expected-dir-file \ +ii-0033-test \ +ii-0034-input-dir-file \ +ii-0034-input-info-file \ +ii-0034-expected-dir-file \ +ii-0034-test \ +ii-0035-input-dir-file \ +ii-0035-input-info-file \ +ii-0035-expected-dir-file \ +ii-0035-test \ +ii-0036-input-dir-file \ +ii-0036-input-info-file \ +ii-0036-expected-dir-file \ +ii-0036-test \ +ii-0037-input-dir-file \ +ii-0037-input-info-file \ +ii-0037-expected-dir-file \ +ii-0037-test \ +ii-0038-input-dir-file \ +ii-0038-input-info-file \ +ii-0038-expected-dir-file \ +ii-0038-test \ +ii-0039-input-dir-file \ +ii-0039-input-info-file \ +ii-0039-expected-dir-file \ +ii-0039-test \ +ii-0040-input-dir-file \ +ii-0040-input-info-file \ +ii-0040-expected-dir-file \ +ii-0040-test \ +ii-0041-input-dir-file.gz \ +ii-0041-input-info-file \ +ii-0041-expected-dir-file.gz \ +ii-0041-test \ +ii-0042-input-dir-file \ +ii-0042-input-info-file \ +ii-0042-expected-dir-file \ +ii-0042-test \ +ii-0043-input-dir-file \ +ii-0043-input-info-file \ +ii-0043-expected-dir-file \ +ii-0043-test \ +ii-0044-input-dir-file \ +ii-0044-input-info-file \ +ii-0044-expected-dir-file \ +ii-0044-test \ +ii-0045-input-dir-file \ +ii-0045-input-info-file \ +ii-0045-expected-dir-file \ +ii-0045-test \ +ii-0046-input-dir-file \ +ii-0046-expected-dir-file \ +ii-0046-test \ +ii-0047-input-dir-file \ +ii-0047-input-info-file \ +ii-0047-expected-dir-file \ +ii-0047-test \ +ii-0048-input-dir-file \ +ii-0048-input-info-file \ +ii-0048-expected-dir-file \ +ii-0048-test \ +ii-0049-input-dir-file \ +ii-0049-input-info-file \ +ii-0049-expected-dir-file \ +ii-0049-test \ +ii-0050-input-dir-file.gz \ +ii-0050-input-info-file \ +ii-0050-expected-dir-file.gz \ +ii-0050-test \ +README diff -uNrd texinfo.orig/util/tests/install-info/README texinfo/util/tests/install-info/README --- texinfo.orig/util/tests/install-info/README 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/install-info/README 2007-12-24 19:29:57.000000000 -0500 @@ -0,0 +1,163 @@ +This file describes each of the numbered install-info tests + +0001: The 99% case. Installing an Info file. Take a single entry from the + Info file and put it into a pre-existing section in the DIR file. +0002: Installing an Info file. Take two entries from the Info file and put + it into a pre-existing section in the DIR file. +0003: Installing an Info file. Take two entries from the Info file and put + it into a pre-existing section in the DIR file. The entries are + described in two different `START-INFO-DIR-ENTRY' declarations. +0004: Installing an Info file. Take two entries from the Info file and put + it into two pre-existing sections in the DIR file. The entries are + described in two different `INFO-DIR-SECTION' and `START-INFO-DIR-ENTRY' + declarations. +0005: Installing an Info file. Take two entries from the Info file and put + it into one pre-existing section and one non-existing section in the + DIR file. The entries are described in two different `INFO-DIR-SECTION' + and `START-INFO-DIR-ENTRY' declarations. +0006: The 99% case, try 2. Installing an Info file. Take a single entry + from the Info file and put it into a pre-existing section in the DIR + file, but this time the name is not capitalized. +0007: The 99% case, try 3. Installing an Info file. Take a single entry + from the Info file and put it into a pre-existing section in the DIR + file, but this time the entry is not the final entry in the section. +0008: The 99% case, try 4. Installing an Info file. Take a single entry + from the Info file and put it into a pre-existing section in the DIR + file, but this time the entry's description spans more than one line. +0009: The 99% case, try 5. Installing an Info file. Take a single entry + from the Info file and put it into a pre-existing section in the DIR + file, but this time the entry's description does not start on the + 33rd column and requires indentation. +0010: The 99% case, try 6. Installing an Info file. Take a single entry + from the Info file and put it into a pre-existing section in the DIR + file, but this time the entry's one line description requires + multi-line indentation. +0011: Installing an Info file. Take a single entry from the Info file and + put it into a pre-existing section in the DIR file, but this time do + not indent the description. +0012: Installing an Info file. Take a single entry from the Info file and + put it into a pre-existing section in the DIR file, but this time the + entry already exists and will be replaced. +0013: Installing an Info file. Take a single entry from the Info file and + put it into a pre-existing section in the DIR file, but this time the + entry already exists and the --keep-old option is used to override the + replacement. +0014: Installing an Info file. Take a single entry from the Info file and + put it into a pre-existing section in the DIR file, but this time the + entry already exists with a multi-line description and will be + replaced with a single-line description. +0015: Installing an Info file. Take a single entry from the Info file and + put it into a pre-existing section in the DIR file, but this time the + entry already exists with a single-line description and will be + replaced with a multi-line description. +0016: Installing an Info file. The Info file does not contain section or + entry hints, and neither a section nor an entry is specified on the + command-line. Installation does not occur, but is not an error. +0017: Installing an initial Info file into a minimal DIR file. +0018: Installing an initial Info file into an empty (0 byte) DIR file. + Installation does not occur, and is an error. +0019: Installing an initial Info file into an empty (2 byte) DIR file. + Installation does not occur, and is an error. +0020: Installing an Info file. The Info file does not contain section or + entry hints, and a section is not specified on the command-line, but + a --description is. +0021: Installing an Info file. The Info file does not contain section or + entry hints, and a pre-existing --section is stated on the command-line + along with a --description. +0022: Installing an Info file. The Info file does not contain section or + entry hints, and a --name is specified on the command-line. The NAME + starts with *, so the whole name (up to the period) is replaced. +0023: Installing an Info file. The Info file does not contain section or + entry hints, and a --name is specified on the command-line. The NAME + does not start with a *, so just the name (up to the colon) is replaced. +0024: Installing an Info file. The Info file contains section and entry + hints, but we override the section with a non-existing one from the + command-line. +0025: Installing an Info file. The Info file contains section and entry + hints, but we override the section with an existing one from the + command-line. +0026: Installing an Info file. The Info file contains section and entry + hints, but we override the entry with an --entry on the command-line. +0027: Installing an Info file. The Info file contains section and entry + hints, but we override the entry with an --entry on the command-line, + and we also override the section with a --section on the command-line. +0028: Installing an Info file. The Info file contains section and entry + hints, but we override the name portion of the entry with a --name + on the command-line. The NAME starts with a `*' so it replaces the + entire name, up to the period. +0029: Installing an Info file. The Info file contains section and entry + hints, but we override the name portion of the entry with a --name + on the command-line. The NAME does not start with a `*' so it + replaces the name, up to the colon and presumes the basename. +0030: Installing an Info file. The Info file contains section and entry + hints, but we override the description portion of the entry with a + --description on the command-line. +0031: Installing an Info file. The Info file contains section and entry + hints, but we override the description and the name with + --description and --name options on the command-line. The NAME starts + with a `*' so it replaces the entire name, up to the period. +0032: Installing an Info file. The Info file contains section and entry + hints, but we try to override the section with a regular expression + that does not match any existing sections in the DIR file. The + overriding cannot take place, and the entry is installed in the section + specified in the Info file. +0033: Installing an Info file. The Info file contains an entry hint, but no + section hint. We try to specify the section with a --regex option on + the command-line, but the regular expression does not match any + existing sections in the DIR file. +0034: Installing an Info file. The Info file contains an entry hint, but + no section hint, and we try to specify the section with a regular + expression that does not match any existing sections in the DIR file. + We also specify a --section on the command-line to ensure that the + entry will be installed in a section that we explicitly name. +0035: Installing an Info file. The Info file contains section and entry + hints, but we try to specify the section with a regular expression + that does not match any existing sections in the DIR file. We also + specify a --section on the command-line to ensure that the entry will + be installed in a section that we explicitly name. +0036: Installing an Info file. The Info file contains entry and section + hints, but try to specify the section with a --regex option on + the command-line, and the regular expression matches an existing + section in the DIR file. +0037: Installing an Info file. The Info file contains section and entry + hints, but we try to specify the section with a regular expression + that does not match any existing sections in the DIR file. We also + specify a --section on the command-line to ensure that the entry will + be installed in a section that we explicitly name. We use the + alternative Debian --section REGEX TITLE syntax instead of the normal + GNU syntax. +0038: Installing an Info file. The Info file does not contain section or + entry hints, and we specify that two entries go into two sections on + the command-line. One section already exists, and the other doesn't. +0039: Installing an Info file. The Info file contains section and entry + hints, but we override the entry with an --entry option on the + command-line. The entry has a multi-line description and is not + indented. +0040: Installing an Info file. The Info file contains section and entry + hints, but we override the entry with --name and --description options + on the command-line. The entry is not indented. +0041: Installing an Info file. The Info file contains section and entry + hints, and we're installing the entry into a gzipped DIR file. +0042: Installing an Info file. The Info file contains section and entry + hints for two entries in two sections. Both of the sections do not + already exist in the DIR file. The sections will be added prior to + all other sections due to the alphabetic ordering of section names. +0043: Installing an Info file. The Info file contains section and entry + hints, and we're going to install the new section admist many other + sections. E.g. instead of always at the very bottom or at the very + top. +0044: The 99% case. Removing an Info file. The Info file is responsible + for a single entry in the DIR file. +0045: Removing an Info file. The Info file is responsible for many entries + in the DIR file. +0046: Removing an Info file. We no longer have the Info file, so we + specify --remove-exactly to remove it instead. +0047: Removing an Info file. The Info file is responsible for the final + entry in the DIR file. The section also gets removed. +0048: Removing an Info file. The Info file is responsible for the final + entry in the DIR file, but we want to keep the section heading, so + we specify --keep-old. +0049: Removing an Info file. The Info file is not responsible for any + entries in the DIR file. A warning is issued, but it isn't an error. +0050: Removing an Info file. The Info file is responsible for a single + entry in the gzipped DIR file. diff -uNrd texinfo.orig/util/tests/Makefile.am texinfo/util/tests/Makefile.am --- texinfo.orig/util/tests/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ texinfo/util/tests/Makefile.am 2007-12-24 19:24:03.000000000 -0500 @@ -0,0 +1,12 @@ +# Makefile.am for texinfo/util/tests. +# Run automake in ../../ to produce Makefile.in from this. +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +SUBDIRS=install-info