Commit 6717f31e authored by Evan Hunt's avatar Evan Hunt

remove master test (duplicates lib/isc/tests/master_test)

parent ccfe778c
......@@ -9,7 +9,6 @@ t_db
gsstest
t_dst
t_hashes
t_master
t_mem
t_names
t_net
......
......@@ -32,7 +32,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
LIBS = @LIBS@
SUBDIR = atomic db dst master mem hashes names net rbt resolver \
SUBDIR = atomic db dst mem hashes names net rbt resolver \
sockaddr tasks timers system @PKCS11_TOOLS@ optional
TESTDIRS = system
......
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
srcdir = @srcdir@
VPATH = @srcdir@
top_srcdir = @top_srcdir@
@BIND9_MAKE_INCLUDES@
CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} \
${ISC_INCLUDES} @DST_OPENSSL_INC@
CDEFINES = @CRYPTO@
CWARNINGS =
# Note that we do not want to use libtool for libt_api
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ISCLIBS = ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
ISCDEPLIBS = ../../../lib/isc/libisc.@A@
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
TLIB = ../../../lib/tests/libt_api.@A@
TARGETS = t_master@EXEEXT@
SRCS = t_master.c
@BIND9_MAKE_RULES@
t_master@EXEEXT@: t_master.@O@ ${DEPLIBS} ${TLIB}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_master.@O@ ${TLIB} ${LIBS}
test: t_master@EXEEXT@
-@ ./t_master@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
testhelp:
@ ./t_master@EXEEXT@ -h
clean distclean::
rm -f ${TARGETS}
#
# test data for dns_master_load test 9
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master10.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 11
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master11.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 1
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master1.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 2
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master2.data test in ISC_R_UNEXPECTEDEND
#
# test data for dns_master_load test 3
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master3.data test in DNS_R_NOOWNER
#
# test data for dns_master_load test 4
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master4.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 5
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master5.data test in DNS_R_BADCLASS
#
# test data for dns_master_load test 6
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master6.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 7
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master7.data test in ISC_R_SUCCESS
#
# test data for dns_master_load test 8
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master8.data test in DNS_R_SEENINCLUDE
#
# test data for dns_master_load test 9
#
# format is:
# masterfile origin class expected_result
# where
# masterfile name is the name of a file containing master data
# origin is the origin
# class is the zone's class
# expected_result is a text representation of a dns_result_t
#
master9.data test in DNS_R_BADCLASS
$TTL 1000
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
a in ns ns.vix.com.
a in ns ns2vix.com.
a in ns ns3vix.com.
b in a 1.2.3.4
;
; the following black line contains spaces
;
@ 300 IN A 10.0.0.1
;
;
;
; The following serial number contains a leading 0 and a 9 so the
; we can catch cases where it is incorrectly treated as a octal
; number.
;
@ 300 IN SOA ns hostmaster 00090000 1200 3600 604800 300
$TTL 1000
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
a in ns
a in ns ns2vix.com.
a in ns ns3vix.com.
b in a 1.2.3.4
$TTL 1000
in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
in ns ns.vix.com
in ns ns2vix.com.
a in ns ns3vix.com.
b in a 1.2.3.4
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
a in ns ns.vix.com.
a in ns ns2vix.com.
a in ns ns3vix.com.
b in a 1.2.3.4
$TTL 1000
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
a any ns ns.vix.com.
a in ns ns2vix.com.
a in ns ns3vix.com.
b in a 1.2.3.4
$TTL 1000
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
secure1 3600 IN DNSKEY (
FLAG2|FLAG4|FLAG5|NTYP3|FLAG8|FLAG9|FLAG10|FLAG11|SIG15
3 3
ArT0a8FtOZWEONG2YQVl9+RA34op30JPz4NPEroCxm2yImT2
2OYggnPIzrgayyepgKU1PfTTypnJDTwrSrtISyEsj7tjM7/n
03DP8VWSn0aLwpUuc7Sx9vtM1Wi+YeiA4Bv2Oz1VB9de4qql
sIq+KLn8J4wz95bGnJ0mHUB7oTDJ3Hl1zeaCMdX69Kr46yAY
AvGJJdGGDYxYgxzx2zNdzypkYSkxpdsNqUt38tabSfdvCn12
pnmSWjlVJsjHhsaYnrPhouN5acOXMNbxNVbGU5LZ8Es6EYbV
/7YMt8VUkA8/8UCszBBT7XAJ3OFjiMO8mvxrZZFzvwJlPBQ1
oFq/TNZlSe+N )
secure2 3600 in DNSKEY (
flag2|flag4|flag5|ntyp3|flag8|flag9|flag10|flag11|sig15
3 3
ArT0a8FtOZWEONG2YQVl9+RA34op30JPz4NPEroCxm2yImT2
2OYggnPIzrgayyepgKU1PfTTypnJDTwrSrtISyEsj7tjM7/n
03DP8VWSn0aLwpUuc7Sx9vtM1Wi+YeiA4Bv2Oz1VB9de4qql
sIq+KLn8J4wz95bGnJ0mHUB7oTDJ3Hl1zeaCMdX69Kr46yAY
AvGJJdGGDYxYgxzx2zNdzypkYSkxpdsNqUt38tabSfdvCn12
pnmSWjlVJsjHhsaYnrPhouN5acOXMNbxNVbGU5LZ8Es6EYbV
/7YMt8VUkA8/8UCszBBT7XAJ3OFjiMO8mvxrZZFzvwJlPBQ1
oFq/TNZlSe+N )
$TTL 1000
@ in soa localhost. postmaster.localhost. (
1993050801 ;serial
3600 ;refresh
1800 ;retry
604800 ;expiration
3600 ) ;minimum
secure1 3600 IN DNSKEY (
NOKEY|FLAG2|FLAG4|FLAG5|NTYP3|FLAG8|FLAG9|FLAG10|FLAG11|SIG15
3 3 )
secure2 3600 in DNSKEY (
nokey|flag2|flag4|flag5|ntyp3|flag8|flag9|flag10|flag11|sig15
3 3 )
;
; master7.data contains a good zone file
;
$include master7.data
;
; master5.data is bad
;
$include master5.data
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
/* $Id: t_master.c,v 1.41 2011/03/12 04:59:46 tbox Exp $ */
#include <config.h>
#include <ctype.h>
#include <stdlib.h>
#include <isc/buffer.h>
#include <isc/mem.h>
#include <isc/string.h> /* Required for HP/UX (and others?) */
#include <isc/util.h>
#include <dns/callbacks.h>
#include <dns/master.h>
#include <dns/name.h>
#include <dns/rdataclass.h>
#include <dns/rdataset.h>
#include <dns/result.h>
#include <tests/t_api.h>
#define BUFLEN 255
#define BIGBUFLEN (64 * 1024)
static isc_result_t
t1_add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset);
isc_mem_t *T1_mctx;
char *Tokens[T_MAXTOKS + 1];
static isc_result_t
t1_add_callback(void *arg, const dns_name_t *owner, dns_rdataset_t *dataset) {
char buf[BIGBUFLEN];
isc_buffer_t target;
isc_result_t result;
UNUSED(arg);
isc_buffer_init(&target, buf, BIGBUFLEN);
result = dns_rdataset_totext(dataset, owner, ISC_FALSE, ISC_FALSE,
&target);
if (result != ISC_R_SUCCESS)
t_info("dns_rdataset_totext: %s\n", dns_result_totext(result));
return(result);
}
static int
test_master(char *testfile, char *origin, char *db_class,
isc_result_t exp_result)
{
int result;
int len;
isc_result_t isc_result;
isc_result_t dns_result;
dns_name_t dns_origin;
isc_buffer_t source;
isc_buffer_t target;
unsigned char name_buf[BUFLEN];
dns_rdatacallbacks_t callbacks;
dns_rdataclass_t rdataclass;
isc_textregion_t textregion;
if (T1_mctx == NULL)
isc_result = isc_mem_create(0, 0, &T1_mctx);
else
isc_result = ISC_R_SUCCESS;
if (isc_result != ISC_R_SUCCESS) {
t_info("isc_mem_create failed %d\n", isc_result);
return(T_UNRESOLVED);
}
len = strlen(origin);
isc_buffer_init(&source, origin, len);
isc_buffer_add(&source, len);
isc_buffer_setactive(&source, len);
isc_buffer_init(&target, name_buf, BUFLEN);
dns_name_init(&dns_origin, NULL);
dns_result = dns_name_fromtext(&dns_origin, &source, dns_rootname,
0, &target);
if (dns_result != ISC_R_SUCCESS) {
t_info("dns_name_fromtext failed %s\n",
dns_result_totext(dns_result));
return(T_UNRESOLVED);
}
dns_rdatacallbacks_init_stdio(&callbacks);
callbacks.add = t1_add_callback;
textregion.base = db_class;
textregion.length = strlen(db_class);
dns_result = dns_rdataclass_fromtext(&rdataclass, &textregion);
if (dns_result != ISC_R_SUCCESS) {
t_info("dns_rdataclass_fromtext failed %s\n",
dns_result_totext(dns_result));
return(T_UNRESOLVED);
}
dns_result = dns_master_loadfile( testfile,
&dns_origin,
&dns_origin,
rdataclass,
ISC_TRUE,
&callbacks,
T1_mctx);
if (dns_result == exp_result)
result = T_PASS;
else {
t_info("dns_master_loadfile: got %s, expected %s\n",
dns_result_totext(dns_result),
dns_result_totext(exp_result));
result = T_FAIL;
}
return(result);
}
static int
test_master_x(const char *filename) {
FILE *fp;
char *p;
int line;
int cnt;
int result;
result = T_UNRESOLVED;
fp = fopen(filename, "r");
if (fp != NULL) {
line = 0;
while ((p = t_fgetbs(fp)) != NULL) {
++line;
/*
* Skip comment lines.
*/
if ((isspace(*p & 0xff)) || (*p == '#')) {
(void)free(p);
continue;
}
/*
* Name of data file, origin, zclass, expected result.
*/
cnt = t_bustline(p, Tokens);
if (cnt == 4) {
result = test_master(Tokens[0], Tokens[1],
Tokens[2],
t_dns_result_fromtext(Tokens[3]));
} else {
t_info("bad format in %s at line %d\n",
filename, line);
}
(void)free(p);
}
(void)fclose(fp);
} else {
t_info("Missing datafile %s\n", filename);
}
return(result);
}
static const char *a1 = "dns_master_loadfile loads a valid master file and "
"returns ISC_R_SUCCESS";
static void
t1(void) {
int result;
t_assert("dns_master_loadfile", 1, T_REQUIRED, "%s", a1);
result = test_master_x("dns_master_load_1_data");
t_result(result);
}
static const char *a2 =
"dns_master_loadfile returns ISC_R_UNEXPECTEDEND when the "
"masterfile input ends unexpectedly";
static void
t2(void) {
int result;
t_assert("dns_master_loadfile", 2, T_REQUIRED, "%s", a2);
result = test_master_x("dns_master_load_2_data");
t_result(result);
}
static const char *a3 = "dns_master_loadfile returns DNS_R_NOOWNER when the "
"an ownername is not specified";
static void
t3() {
int result;
t_assert("dns_master_loadfile", 3, T_REQUIRED, "%s", a3);
result = test_master_x("dns_master_load_3_data");
t_result(result);
}
static const char *a4 = "dns_master_loadfile accepts broken zone files "
"where the first record has an undefined TTL, "
"as long as it is a SOA";
static void
t4() {
int result;
t_assert("dns_master_loadfile", 4, T_REQUIRED, "%s", a4);
result = test_master_x("dns_master_load_4_data");
t_result(result);
}
static const char *a5 = "dns_master_loadfile returns DNS_R_BADCLASS when the "
"the record class did not match the zone class";
static void
t5() {
int result;
t_assert("dns_master_loadfile", 5, T_REQUIRED, "%s", a5);
result = test_master_x("dns_master_load_5_data");
t_result(result);
}
static const char *a6 =
"dns_master_loadfile understands DNSKEY RR specifications "
"containing key material";
static void
t6() {
int result;
t_assert("dns_master_loadfile", 6, T_REQUIRED, "%s", a6);
result = test_master_x("dns_master_load_6_data");
t_result(result);
}
static const char *a7 =
"dns_master_loadfile understands DNSKEY RR specifications "
"containing no key material";
static void
t7() {
int result;
t_assert("dns_master_loadfile", 7, T_REQUIRED, "%s", a7);
result = test_master_x("dns_master_load_7_data");
t_result(result);
}
static const char *a8 =
"dns_master_loadfile understands $INCLUDE";
static void
t8() {
int result;
t_assert("dns_master_loadfile", 8, T_REQUIRED, "%s", a8);
result = test_master_x("dns_master_load_8_data");
t_result(result);
}
static const char *a9 =
"dns_master_loadfile understands $INCLUDE with failure";
static void
t9() {
int result;
t_assert("dns_master_loadfile", 9, T_REQUIRED, "%s", a9);
result = test_master_x("dns_master_load_9_data");
t_result(result);
}
static const char *a10 =
"dns_master_loadfile non-empty blank lines";
static void
t10() {
int result;
t_assert("dns_master_loadfile", 10, T_REQUIRED, "%s", a10);
result = test_master_x("dns_master_load_10_data");
t_result(result);
}
static const char *a11 =
"dns_master_loadfile allow leading zeros in SOA";
static void
t11() {
int result;
t_assert("dns_master_loadfile", 11, T_REQUIRED, "%s", a11);
result = test_master_x("dns_master_load_11_data");
t_result(result);
}
testspec_t T_testlist[] = {
{ (PFV) t1, "ISC_R_SUCCESS" },
{ (PFV) t2, "ISC_R_UNEXPECTEDEND" },
{ (PFV) t3, "DNS_NOOWNER" },
{ (PFV) t4, "DNS_NOTTL" },
{ (PFV) t5, "DNS_BADCLASS" },
{ (PFV) t6, "DNSKEY RR 1" },
{ (PFV) t7, "DNSKEY RR 2" },
{ (PFV) t8, "$INCLUDE" },
{ (PFV) t9, "$INCLUDE w/ DNS_BADCLASS" },
{ (PFV) t10, "non empty blank lines" },
{ (PFV) t11, "leading zeros in serial" },
{ (PFV) 0, NULL }
};
#ifdef WIN32
int
main(int argc, char **argv) {
t_settests(T_testlist);
return (t_main(argc, argv));
}
#endif
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\t_master.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|@PLATFORM@">
<Configuration>Debug</Configuration>
<Platform>@PLATFORM@</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|@PLATFORM@">
<Configuration>Release</Configuration>
<Platform>@PLATFORM@</Platform>