Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
445
Issues
445
List
Boards
Labels
Service Desk
Milestones
Merge Requests
71
Merge Requests
71
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
ef190263
Commit
ef190263
authored
Dec 19, 2012
by
Jeremy C. Reed
Browse files
Options
Browse Files
Download
Plain Diff
[master]Merge branch 'master' of
ssh://git.bind10.isc.org/var/bind10/git/bind10
parents
7299bfac
8d844f04
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
9 deletions
+13
-9
tests/system/bindctl/setup.sh
tests/system/bindctl/setup.sh
+1
-1
tests/system/bindctl/tests.sh
tests/system/bindctl/tests.sh
+4
-0
tests/system/glue/setup.sh.in
tests/system/glue/setup.sh.in
+4
-4
tests/system/ixfr/in-1/setup.sh.in
tests/system/ixfr/in-1/setup.sh.in
+1
-1
tests/system/ixfr/in-2/setup.sh.in
tests/system/ixfr/in-2/setup.sh.in
+1
-1
tests/system/ixfr/in-3/setup.sh.in
tests/system/ixfr/in-3/setup.sh.in
+1
-1
tests/system/ixfr/in-4/setup.sh.in
tests/system/ixfr/in-4/setup.sh.in
+1
-1
No files found.
tests/system/bindctl/setup.sh
View file @
ef190263
...
...
@@ -22,5 +22,5 @@ SUBTEST_TOP=${TEST_TOP}/bindctl
cp
${
SUBTEST_TOP
}
/nsx1/b10-config.db.template
${
SUBTEST_TOP
}
/nsx1/b10-config.db
rm
-f
${
SUBTEST_TOP
}
/
*
/zone.sqlite3
${
B10_LOADZONE
}
-
c
'{"database_file": "'
${
SUBTEST_TOP
}
/nsx1/zone.sqlite3
'"}'
\
${
B10_LOADZONE
}
-
i
1
-c
"{
\"
database_file
\"
:
\"
${
SUBTEST_TOP
}
/nsx1/zone.sqlite3
\"
}"
\
.
${
SUBTEST_TOP
}
//nsx1/root.db
tests/system/bindctl/tests.sh
View file @
ef190263
...
...
@@ -85,6 +85,7 @@ config commit
quit
'
|
$RUN_BINDCTL
\
--csv-file-dir
=
$BINDCTL_CSV_DIR
2>&1
>
/dev/null
||
status
=
1
sleep
2
$DIG
+norec @10.53.0.1
-p
53210 ns.example.com. A
>
dig.out.
$n
||
status
=
1
# perform a simple check on the output (digcomp would be too much for this)
grep
192.0.2.1 dig.out.
$n
>
/dev/null
||
status
=
1
...
...
@@ -118,6 +119,7 @@ config commit
quit
"
|
$RUN_BINDCTL
\
--csv-file-dir
=
$BINDCTL_CSV_DIR
>
bindctl.out.
$n
||
status
=
1
sleep
2
$DIG
+norec @10.53.0.1
-p
53210 ns.example.com. A
>
dig.out.
$n
||
status
=
1
grep
192.0.2.2 dig.out.
$n
>
/dev/null
||
status
=
1
if
[
$status
!=
0
]
;
then
echo
"I:failed"
;
fi
...
...
@@ -148,6 +150,7 @@ quit
'
|
$RUN_BINDCTL
\
--csv-file-dir
=
$BINDCTL_CSV_DIR
2>&1
>
/dev/null
||
status
=
1
done
sleep
2
$DIG
+norec @10.53.0.1
-p
53210 ns.example.com. A
>
dig.out.
$n
||
status
=
1
grep
192.0.2.2 dig.out.
$n
>
/dev/null
||
status
=
1
if
[
$status
!=
0
]
;
then
echo
"I:failed"
;
fi
...
...
@@ -183,6 +186,7 @@ quit
'
|
$RUN_BINDCTL
\
--csv-file-dir
=
$BINDCTL_CSV_DIR
2>&1
>
/dev/null
||
status
=
1
done
sleep
2
$DIG
+norec @10.53.0.1
-p
53210 ns.example.com. A
>
dig.out.
$n
||
status
=
1
grep
192.0.2.2 dig.out.
$n
>
/dev/null
||
status
=
1
if
[
$status
!=
0
]
;
then
echo
"I:failed"
;
fi
...
...
tests/system/glue/setup.sh.in
View file @
ef190263
...
...
@@ -18,8 +18,8 @@ SYSTEMTESTTOP=..
.
$SYSTEMTESTTOP
/conf.sh
rm
-f
*
/zone.sqlite3
${
B10_LOADZONE
}
-
o
.
-d
@builddir@/nsx1/zone.sqlite3
@builddir@/nsx1/root.db
${
B10_LOADZONE
}
-
o
root-servers.nil
-d
@builddir@/nsx1/zone.sqlite3
\
${
B10_LOADZONE
}
-
i
1
-c
'{"database_file": "@builddir@/nsx1/zone.sqlite3"}'
.
@builddir@/nsx1/root.db
${
B10_LOADZONE
}
-
i
1
-c
'{"database_file": "@builddir@/nsx1/zone.sqlite3"}'
root-servers.nil
\
@builddir@/nsx1/root-servers.nil.db
${
B10_LOADZONE
}
-
o
com
-d
@builddir@/nsx1/zone.sqlite3
@builddir@/nsx1/com.db
${
B10_LOADZONE
}
-
o
net
-d
@builddir@/nsx1/zone.sqlite3
@builddir@/nsx1/net.db
${
B10_LOADZONE
}
-
i
1
-c
'{"database_file": "@builddir@/nsx1/zone.sqlite3"}'
com
@builddir@/nsx1/com.db
${
B10_LOADZONE
}
-
i
1
-c
'{"database_file": "@builddir@/nsx1/zone.sqlite3"}'
net
@builddir@/nsx1/net.db
tests/system/ixfr/in-1/setup.sh.in
View file @
ef190263
...
...
@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n4 ns1/db.example
# Set up the IXFR client - load the same version of the zone.
cp
-f
$IXFR_TOP
/b10-config.db nsx2/b10-config.db
${
B10_LOADZONE
}
-
o
.
-d
$IXFR_TOP
/zone.sqlite3
$IXFR_TOP
/db.example.n4
${
B10_LOADZONE
}
-
c
"{
\"
database_file
\"
:
\"
$IXFR_TOP
/zone.sqlite3
\"
}"
example.
$IXFR_TOP
/db.example.n4
tests/system/ixfr/in-2/setup.sh.in
View file @
ef190263
...
...
@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n6 ns1/db.example
# Set up the IXFR client - load an earlier version of the zone
cp
-f
$IXFR_TOP
/b10-config.db nsx2/b10-config.db
${
B10_LOADZONE
}
-
o
.
-d
$IXFR_TOP
/zone.sqlite3
$IXFR_TOP
/db.example.n6
${
B10_LOADZONE
}
-
c
"{
\"
database_file
\"
:
\"
$IXFR_TOP
/zone.sqlite3
\"
}"
example.
$IXFR_TOP
/db.example.n6
tests/system/ixfr/in-3/setup.sh.in
View file @
ef190263
...
...
@@ -26,4 +26,4 @@ cp -f $IXFR_TOP/db.example.n0 ns1/db.example
# Set up the IXFR client - load a previous version of the zone.
cp
-f
$IXFR_TOP
/b10-config.db nsx2/b10-config.db
${
B10_LOADZONE
}
-
o
.
-d
$IXFR_TOP
/zone.sqlite3
$IXFR_TOP
/db.example.n2
${
B10_LOADZONE
}
-
c
"{
\"
database_file
\"
:
\"
$IXFR_TOP
/zone.sqlite3
\"
}"
example.
$IXFR_TOP
/db.example.n2
tests/system/ixfr/in-4/setup.sh.in
View file @
ef190263
...
...
@@ -27,4 +27,4 @@ cp -f $IXFR_TOP/db.example.n2.refresh ns1/db.example
# Set up the IXFR client - load a previous version of the zone with a short
# refresh time.
cp
-f
$IXFR_TOP
/b10-config.db nsx2/b10-config.db
${
B10_LOADZONE
}
-
o
.
-d
$IXFR_TOP
/zone.sqlite3
$IXFR_TOP
/db.example.n2.refresh
${
B10_LOADZONE
}
-
c
"{
\"
database_file
\"
:
\"
$IXFR_TOP
/zone.sqlite3
\"
}"
example.
$IXFR_TOP
/db.example.n2.refresh
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment