Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
18e88350
Commit
18e88350
authored
Dec 13, 2018
by
Curtis Blackburn
Committed by
Evan Hunt
Dec 14, 2018
Browse files
windows CRLF issues fixed in builtin test
parent
0289f3f2
Changes
1
Hide whitespace changes
Inline
Side-by-side
bin/tests/system/builtin/tests.sh
View file @
18e88350
...
...
@@ -178,28 +178,28 @@ n=`expr $n + 1`
ret
=
0
echo_i
"Checking that default version works for query (
$n
)"
$DIG
$DIGOPTS
+short version.bind txt ch @10.53.0.1
>
dig.out.ns1.
$n
grep
"^
\"
$VERSION
\"
$"
dig.out.ns1.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns1.
$n
|
grep
"^
\"
$VERSION
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that custom version works for query (
$n
)"
$DIG
$DIGOPTS
+short version.bind txt ch @10.53.0.3
>
dig.out.ns3.
$n
grep
"^
\"
this is a test of version
\"
$"
dig.out.ns3.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns3.
$n
|
grep
"^
\"
this is a test of version
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that default hostname works for query (
$n
)"
$DIG
$DIGOPTS
+short hostname.bind txt ch @10.53.0.1
>
dig.out.ns1.
$n
grep
"^
\"
$HOSTNAME
\"
$"
dig.out.ns1.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns1.
$n
|
grep
"^
\"
$HOSTNAME
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that custom hostname works for query (
$n
)"
$DIG
$DIGOPTS
+short hostname.bind txt ch @10.53.0.3
>
dig.out.ns3.
$n
grep
"^
\"
this.is.a.test.of.hostname
\"
$"
dig.out.ns3.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns3.
$n
|
grep
"^
\"
this.is.a.test.of.hostname
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
...
...
@@ -214,28 +214,28 @@ n=`expr $n + 1`
ret
=
0
echo_i
"Checking that server-id hostname works for query (
$n
)"
$DIG
$DIGOPTS
+short id.server txt ch @10.53.0.2
>
dig.out.ns2.
$n
grep
"^
\"
$HOSTNAME
\"
$"
dig.out.ns2.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns2.
$n
|
grep
"^
\"
$HOSTNAME
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that server-id hostname works for EDNS name server ID request (
$n
)"
$DIG
$DIGOPTS
+norec +nsid foo @10.53.0.2
>
dig.out.ns2.
$n
grep
"^; NSID: .* (
\"
$HOSTNAME
\"
)$"
dig.out.ns2.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns2.
$n
|
grep
"^; NSID: .* (
\"
$HOSTNAME
\"
)$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that custom server-id works for query (
$n
)"
$DIG
$DIGOPTS
+short id.server txt ch @10.53.0.3
>
dig.out.ns3.
$n
grep
"^
\"
this.is.a.test.of.server-id
\"
$"
dig.out.ns3.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns3.
$n
|
grep
"^
\"
this.is.a.test.of.server-id
\"
$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
n
=
`
expr
$n
+ 1
`
ret
=
0
echo_i
"Checking that custom server-id works for EDNS name server ID request (
$n
)"
$DIG
$DIGOPTS
+norec +nsid foo @10.53.0.3
>
dig.out.ns3.
$n
grep
"^; NSID: .* (
\"
this.is.a.test.of.server-id
\"
)$"
dig.out.ns3.
$n
>
/dev/null
||
ret
=
1
tr
-d
'\r'
< dig.out.ns3.
$n
|
grep
"^; NSID: .* (
\"
this.is.a.test.of.server-id
\"
)$"
>
/dev/null
||
ret
=
1
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
status
=
`
expr
$status
+
$ret
`
;
fi
echo_i
"exit status:
$status
"
...
...
Curtis Blackburn
@ckb
mentioned in commit
e0ab5603
·
Dec 15, 2018
mentioned in commit
e0ab5603
mentioned in commit e0ab5603f7073083397145a81544319252390238
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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