Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joey Salazar
BIND
Commits
bf9c6007
Commit
bf9c6007
authored
Sep 11, 2018
by
Evan Hunt
Browse files
don't use $() in system tests
parent
874a4baf
Changes
3
Hide whitespace changes
Inline
Side-by-side
bin/tests/system/cds/setup.sh
View file @
bf9c6007
...
...
@@ -20,13 +20,13 @@ touch empty
Z
=
cds.test
keyz
=
$(
$KEYGEN
-q
-a
RSASHA256
$Z
)
key1
=
$(
$KEYGEN
-q
-a
RSASHA256
-f
KSK
$Z
)
key2
=
$(
$KEYGEN
-q
-a
RSASHA256
-f
KSK
$Z
)
keyz
=
`
$KEYGEN
-q
-a
RSASHA256
$Z
`
key1
=
`
$KEYGEN
-q
-a
RSASHA256
-f
KSK
$Z
`
key2
=
`
$KEYGEN
-q
-a
RSASHA256
-f
KSK
$Z
`
idz
=
$(
echo
$keyz
|
sed
's/.*+0*//'
)
id1
=
$(
echo
$key1
|
sed
's/.*+0*//'
)
id2
=
$(
echo
$key2
|
sed
's/.*+0*//'
)
idz
=
`
echo
$keyz
|
sed
's/.*+0*//'
`
id1
=
`
echo
$key1
|
sed
's/.*+0*//'
`
id2
=
`
echo
$key2
|
sed
's/.*+0*//'
`
cat
<<
EOF
>vars.sh
Z=
$Z
...
...
@@ -120,10 +120,11 @@ $mangle '\s+IN\s+RRSIG\s+CDS .* '$id1' '$Z'\. ' \
$mangle
" IN CDS
$id1
8 1 "
<db.cds.1 |
sign cds-mangled
sed
's/IN CDS '
$id1
' 8 1 /IN CDS '
$((
id1
^
255
))
' 8 1 /'
<db.cds.1 |
bad
=
`
$PERL
-le
"print (
$id1
^ 255);"
`
sed
's/IN CDS '
$id1
' 8 1 /IN CDS '
$bad
' 8 1 /'
<db.cds.1 |
sign bad-digests
sed
'/IN CDS '
$id1
' 8 /p;s//IN CDS '
$
((
id1
^
255
))
' 13 /'
<db.cds.1 |
sed
'/IN CDS '
$id1
' 8 /p;s//IN CDS '
$
bad
' 13 /'
<db.cds.1 |
sign bad-algos
rm
-f
dsset-
*
bin/tests/system/rrsetorder/tests.sh
View file @
bf9c6007
...
...
@@ -17,7 +17,7 @@ DIGCMD="$DIG $DIGOPTS -p ${PORT}"
status
=
0
GOOD_RANDOM
=
"
$(
seq
1 24
)
"
GOOD_RANDOM
=
"
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
"
GOOD_RANDOM_NO
=
24
if
grep
"^#define DNS_RDATASET_FIXED"
$TOP
/config.h
>
/dev/null 2>&1
;
then
...
...
@@ -139,7 +139,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of
${
GOOD_RANDOM_NO
}
possible orders in 36 samples"
if
[
$match
-lt
$((
(
${
GOOD_RANDOM_NO
}
/
3
))
)
]
;
then
ret
=
1
;
fi
if
[
$match
-lt
`
expr
${
GOOD_RANDOM_NO
}
/ 3
`
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -233,7 +233,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of
${
GOOD_RANDOM_NO
}
possible orders in 36 samples"
if
[
$match
-lt
$((
(
${
GOOD_RANDOM_NO
}
/
3
))
)
]
;
then
ret
=
1
;
fi
if
[
$match
-lt
`
expr
${
GOOD_RANDOM_NO
}
/ 3
`
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -343,7 +343,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of
${
GOOD_RANDOM_NO
}
possible orders in 36 samples"
if
[
$match
-lt
$((
(
${
GOOD_RANDOM_NO
}
/
3
))
)
]
;
then
ret
=
1
;
fi
if
[
$match
-lt
`
expr
${
GOOD_RANDOM_NO
}
/ 3
`
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
status
=
`
expr
$status
+
$ret
`
...
...
@@ -441,7 +441,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Random selection return
$match
of
${
GOOD_RANDOM_NO
}
possible orders in 36 samples"
if
[
$match
-lt
$((
(
${
GOOD_RANDOM_NO
}
/
3
))
)
]
;
then
ret
=
1
;
fi
if
[
$match
-lt
`
expr
${
GOOD_RANDOM_NO
}
/ 3
`
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
echo_i
"Checking default order (cache)"
...
...
@@ -467,7 +467,7 @@ do
eval
"match=
\`
expr
\$
match +
\$
match
$i
\`
"
done
echo_i
"Default selection return
$match
of
${
GOOD_RANDOM_NO
}
possible orders in 36 samples"
if
[
$match
-lt
$((
(
${
GOOD_RANDOM_NO
}
/
3
))
)
]
;
then
ret
=
1
;
fi
if
[
$match
-lt
`
expr
${
GOOD_RANDOM_NO
}
/ 3
`
]
;
then
ret
=
1
;
fi
if
[
$ret
!=
0
]
;
then
echo_i
"failed"
;
fi
echo_i
"Checking default order no match in rrset-order (no shuffling)"
...
...
doc/dev/style.md
View file @
bf9c6007
...
...
@@ -749,7 +749,7 @@ Bash should be avoided. Some pitfalls to avoid:
`$(parentheses)`
*
For arithmetical computation, use
`` `expr {expression}` ``
, not
`$((expression))`
*
To te
x
t string length use
`` `expr $string : ".*"` ``
rather than
``
*
To te
s
t string length use
`` `expr $string : ".*"` ``
rather than
``
`expr length $string` ``
*
To test for the presence of a string in a file without printing anything
to stdout, use
`"grep string filename > /dev/null 2>&1"`
, rather than
...
...
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