diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/README | 12 | ||||
| -rwxr-xr-x | test/runtest | 12 | ||||
| -rw-r--r-- | test/src/fakens.c | 8 | ||||
| -rw-r--r-- | test/src/server.c | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 0c8d9b71c..3d7810c8b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -33,7 +33,7 @@ makebin:; @if [ ! -e bin ] ; then mkdir bin 2>/dev/null; echo ""; fi # bin/client an SMTP script-driven client, without TLS support # bin/client-gnutls ditto, with GnuTLS support # bin/client-ssl ditto, with OpenSSL support -# bin/fakens a fake namserver +# bin/fakens a fake nameserver # bin/fd output details of open file descriptors # bin/iefbr14 a program that does nothing and returns 0 # bin/loaded a dynamically loaded test module diff --git a/test/README b/test/README index a600756be..38972042f 100644 --- a/test/README +++ b/test/README @@ -269,7 +269,7 @@ There are some options for the ./runtest script itself: This allows "overrides" for the test results. It's intended use is to deal with distro specific differences in the test output. The default flavour is "FOO" if autodetection fails. - (Autodection is possible for known flavours only. Known + (Autodetection is possible for known flavours only. Known flavours are computed after file name extensions in stdout/* and stderr/*.) @@ -416,7 +416,7 @@ after doing any further comparisons that may be necessary. Other circumstances give rise to other prompts. If a test generates output for which there is no saved data, the prompt (after a message stating which file is -unexpectely not empty) is: +unexpectedly not empty) is: Continue, Show, or Quit? [Q] @@ -685,7 +685,7 @@ just one command: The expected return code in this case is 1, and the data lines are passed to Exim on its standard input. Both the command line and the data lines have the -standard substitions applied to them. Thus, HOSTNAME in the example above will +standard substitutions applied to them. Thus, HOSTNAME in the example above will be replaced by the local host's name. Long commands can be continued over several lines by using \ as a continuation character. This does *not* apply to data lines. @@ -778,7 +778,7 @@ found, the entire script is skipped, and a comment is output. need_largefiles This command must be at the head of a script. If the Exim binary does not -suppport large files (off_t is <= 4), the entire script is skipped, and a +support large files (off_t is <= 4), the entire script is skipped, and a comment is output. @@ -884,7 +884,7 @@ When OpenSSL is available on the host, an alternative version of the client program is compiled, one that supports TLS using OpenSSL. The additional arguments specify a certificate and key file when required for the connection. There are two additional options: -tls-on-connect, that causes the client to -initiate TLS negociation immediately on connection; -ocsp that causes the TLS +initiate TLS negotiation immediately on connection; -ocsp that causes the TLS negotiation to include a certificate-status request. The latter takes a filename argument, the CA info for verifying the stapled response. @@ -1135,7 +1135,7 @@ indicating that they are specific to that one test. A few fixed files (for example, some TLS certificates) are used by more than one test, and so their names are not of this form. -There are also some auxilary DNS zone files, which are described in the next +There are also some auxiliary DNS zone files, which are described in the next section. diff --git a/test/runtest b/test/runtest index bbb46542a..6721f1daa 100755 --- a/test/runtest +++ b/test/runtest @@ -968,7 +968,7 @@ RESET_AFTER_EXTRA_LINE_READ: } next if /^tls_validate_require_cipher child \d+ ended: status=0x0/; - # We invoke Exim with -D, so we hit this new messag as of Exim 4.73: + # We invoke Exim with -D, so we hit this new message as of Exim 4.73: next if /^macros_trusted overridden to true by whitelisting/; # We have to omit the localhost ::1 address so that all is well in @@ -1789,7 +1789,7 @@ system("$cmd"); # The <SCRIPT> file is open for us to read an optional return code line, # followed by the command line and any following data lines for stdin. The # command line can be continued by the use of \. Data lines are not continued -# in this way. In all lines, the following substutions are made: +# in this way. In all lines, the following substitutions are made: # # DIR => the current directory # CALLER => the caller of this script @@ -1798,14 +1798,14 @@ system("$cmd"); # reference to the subtest number, holding previous value # reference to the expected return code value # reference to where to put the command name (for messages) -# auxilliary information returned from a previous run +# auxiliary information returned from a previous run # -# Returns: 0 the commmand was executed inline, no subprocess was run +# Returns: 0 the command was executed inline, no subprocess was run # 1 a non-exim command was run and waited for # 2 an exim command was run and waited for # 3 a command was run and not waited for (daemon, server, exim_lock) # 4 EOF was encountered after an initial return code line -# Optionally alse a second parameter, a hash-ref, with auxilliary information: +# Optionally also a second parameter, a hash-ref, with auxiliary information: # exim_pid: pid of a run process # munge: name of a post-script results munger @@ -2808,7 +2808,7 @@ if (defined $parm_support{Content_Scanning}) # This test for an active SpamAssassin is courtesy of John Jetmore. # The tests are hard coded to localhost:783, so no point in making # this test flexible like the clamav test until the test scripts are - # changed. spamd doesn't have the nice PING/PONG protoccol that + # changed. spamd doesn't have the nice PING/PONG protocol that # clamd does, but it does respond to errors in an informative manner, # so use that. diff --git a/test/src/fakens.c b/test/src/fakens.c index e4584c4df..0806136cc 100644 --- a/test/src/fakens.c +++ b/test/src/fakens.c @@ -25,7 +25,7 @@ The arguments to the program are: the DNS record type that is being sought The output from the program is written to stdout. It is supposed to be in -exactly the same format as a traditional namserver response (see RFC 1035) so +exactly the same format as a traditional nameserver response (see RFC 1035) so that Exim can process it as normal. At present, no compression is used. Error messages are written to stderr. @@ -382,7 +382,7 @@ while (fgets(CS buffer, sizeof(buffer), f) != NULL) rr_sec = TRUE; p += 7; } - else if (Ustrncmp(p, US"AA ", 3) == 0) /* tagged as authoritive */ + else if (Ustrncmp(p, US"AA ", 3) == 0) /* tagged as authoritative */ { rr_aa = TRUE; p += 3; @@ -773,8 +773,8 @@ if (yield == NO_RECOVERY) goto END_OFF; header->ancount = htons(count); /* If the AA bit should be set (as indicated by the AA prefix in the zone file), -we are expected to return some records in the authortive section. Bind9: If -there is data in the answer section, the authoritive section contains the NS +we are expected to return some records in the authoritative section. Bind9: If +there is data in the answer section, the authoritative section contains the NS records, otherwise it contains the SOA record. Currently we mimic this behaviour for the first case (there is some answer record). */ diff --git a/test/src/server.c b/test/src/server.c index 9d00300f1..ce55c5c37 100644 --- a/test/src/server.c +++ b/test/src/server.c @@ -661,7 +661,7 @@ for (count = 0; count < connection_count; count++) n = dlen < sizeof(buffer) ? dlen : sizeof(buffer); if ((n = read(dup_accept_socket, CS buffer, n)) == 0) { - printf("Unxpected EOF read from client\n"); + printf("Unexpected EOF read from client\n"); s = s->next; goto END_OFF; } @@ -671,7 +671,7 @@ for (count = 0; count < connection_count; count++) while (dlen-- > 0) if (fgetc(in) == EOF) { - printf("Unxpected EOF read from client\n"); + printf("Unexpected EOF read from client\n"); s = s->next; goto END_OFF; } |