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
Kea
Commits
35f00816
Commit
35f00816
authored
Aug 06, 2014
by
Tomek Mrugalski
🛰
Browse files
[3417] shell scripts updated (B10_ => KEA_)
parent
aba37777
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/lib/log/tests/init_logger_test.sh.in
View file @
35f00816
...
...
@@ -33,7 +33,7 @@ passfail() {
fi
}
echo
"1. Checking that
B10
_LOGGER_SEVERITY/
B10
_LOGGER_DBGLEVEL work"
echo
"1. Checking that
KEA
_LOGGER_SEVERITY/
KEA
_LOGGER_DBGLEVEL work"
echo
-n
" - severity=DEBUG, dbglevel=99: "
cat
>
$tempfile
<<
.
...
...
@@ -45,7 +45,7 @@ WARN [kea.log] LOG_BAD_STREAM bad log console output stream: warn
ERROR
[
kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID
(
error
)
in
compiled code
FATAL
[
kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
.
B10
_LOGGER_DESTINATION
=
stdout
B10
_LOGGER_SEVERITY
=
DEBUG
B10
_LOGGER_DBGLEVEL
=
99 ./init_logger_test |
\
KEA
_LOGGER_DESTINATION
=
stdout
KEA
_LOGGER_SEVERITY
=
DEBUG
KEA
_LOGGER_DBGLEVEL
=
99 ./init_logger_test |
\
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
|
\
cut
-d
' '
-f3-
| diff
$tempfile
-
passfail
$?
...
...
@@ -59,7 +59,7 @@ WARN [kea.log] LOG_BAD_STREAM bad log console output stream: warn
ERROR
[
kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID
(
error
)
in
compiled code
FATAL
[
kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
.
B10
_LOGGER_DESTINATION
=
stdout
B10
_LOGGER_SEVERITY
=
DEBUG
B10
_LOGGER_DBGLEVEL
=
50 ./init_logger_test |
\
KEA
_LOGGER_DESTINATION
=
stdout
KEA
_LOGGER_SEVERITY
=
DEBUG
KEA
_LOGGER_DBGLEVEL
=
50 ./init_logger_test |
\
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
|
\
cut
-d
' '
-f3-
| diff
$tempfile
-
passfail
$?
...
...
@@ -70,33 +70,33 @@ WARN [kea.log] LOG_BAD_STREAM bad log console output stream: warn
ERROR
[
kea.log] LOG_DUPLICATE_MESSAGE_ID duplicate message ID
(
error
)
in
compiled code
FATAL
[
kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
.
B10
_LOGGER_DESTINATION
=
stdout
B10
_LOGGER_SEVERITY
=
WARN ./init_logger_test |
\
KEA
_LOGGER_DESTINATION
=
stdout
KEA
_LOGGER_SEVERITY
=
WARN ./init_logger_test |
\
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
|
\
cut
-d
' '
-f3-
| diff
$tempfile
-
passfail
$?
echo
"2. Checking that
B10
_LOGGER_DESTINATION works"
echo
"2. Checking that
KEA
_LOGGER_DESTINATION works"
echo
-n
" - stdout: "
cat
>
$tempfile
<<
.
FATAL
[
kea.log] LOG_NO_MESSAGE_ID line fatal: message definition line found without a message ID
.
rm
-f
$destfile_tmp
$destfile
B10
_LOGGER_SEVERITY
=
FATAL
B10
_LOGGER_DESTINATION
=
stdout ./init_logger_test 1>
$destfile_tmp
KEA
_LOGGER_SEVERITY
=
FATAL
KEA
_LOGGER_DESTINATION
=
stdout ./init_logger_test 1>
$destfile_tmp
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
<
$destfile_tmp
>
$destfile
cut
-d
' '
-f3-
$destfile
| diff
$tempfile
-
passfail
$?
echo
-n
" - stderr: "
rm
-f
$destfile_tmp
$destfile
B10
_LOGGER_SEVERITY
=
FATAL
B10
_LOGGER_DESTINATION
=
stderr ./init_logger_test 2>
$destfile_tmp
KEA
_LOGGER_SEVERITY
=
FATAL
KEA
_LOGGER_DESTINATION
=
stderr ./init_logger_test 2>
$destfile_tmp
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
<
$destfile_tmp
>
$destfile
cut
-d
' '
-f3-
$destfile
| diff
$tempfile
-
passfail
$?
echo
-n
" - file: "
rm
-f
$destfile_tmp
$destfile
B10
_LOGGER_SEVERITY
=
FATAL
B10
_LOGGER_DESTINATION
=
$destfile_tmp
./init_logger_test
KEA
_LOGGER_SEVERITY
=
FATAL
KEA
_LOGGER_DESTINATION
=
$destfile_tmp
./init_logger_test
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
<
$destfile_tmp
>
$destfile
cut
-d
' '
-f3-
$destfile
| diff
$tempfile
-
passfail
$?
...
...
src/lib/log/tests/logger_lock_test.sh.in
View file @
35f00816
...
...
@@ -37,7 +37,7 @@ INFO [kea.log] LOG_LOCK_TEST_MESSAGE this is a test message.
LOGGER_LOCK_TEST: UNLOCK
.
rm
-f
$destfile
B10
_LOGGER_SEVERITY
=
INFO
B10
_LOGGER_DESTINATION
=
stdout ./logger_lock_test |
\
KEA
_LOGGER_SEVERITY
=
INFO
KEA
_LOGGER_DESTINATION
=
stdout ./logger_lock_test |
\
sed
-e
's/\[\([a-z0-9\.]\{1,\}\)\/\([0-9]\{1,\}\)\]/[\1]/'
>
$destfile
cut
-d
' '
-f3-
$destfile
| diff
$tempfile
-
passfail
$?
...
...
src/lib/testutils/dhcp_test_lib.sh.in
View file @
35f00816
...
...
@@ -149,7 +149,7 @@ set_logger() {
clean_exit 1
fi
printf "Kea log will be stored in %s.\n" ${LOG_FILE}
export
B10
_LOGGER_DESTINATION=${LOG_FILE}
export
KEA
_LOGGER_DESTINATION=${LOG_FILE}
}
# Returns the number of running process pids and the list of pids.
...
...
src/lib/util/unittests/run_all.cc
View file @
35f00816
...
...
@@ -45,7 +45,7 @@ run_all() {
if
(
keatest_catch_exception
!=
NULL
)
{
if
(
strcmp
(
keatest_catch_exception
,
"1"
)
==
0
)
{
catch_exception
=
true
;
}
else
if
(
strcmp
(
b10
test_catch_exception
,
"0"
)
==
0
)
{
}
else
if
(
strcmp
(
kea
test_catch_exception
,
"0"
)
==
0
)
{
catch_exception
=
false
;
}
else
{
std
::
cerr
<<
"***ERROR: KEATEST_CATCH_EXCEPTION is '"
...
...
tests/lettuce/setup_intree_bind10.sh.in
View file @
35f00816
...
...
@@ -39,13 +39,13 @@ if test $WANT_EXPERIMENTAL_RESOLVER = yes; then
cp
-f
@srcdir@/features/resolver_basic.feature.disabled @srcdir@/features/resolver_basic.feature
fi
B10
_FROM_SOURCE
=
@abs_top_srcdir@
export
B10
_FROM_SOURCE
KEA
_FROM_SOURCE
=
@abs_top_srcdir@
export
KEA
_FROM_SOURCE
# TODO: We need to do this feature based (ie. no general from_source)
# But right now we need a second one because some spec files are
# generated and hence end up under builddir
B10
_FROM_BUILD
=
@abs_top_builddir@
export
B10
_FROM_BUILD
KEA
_FROM_BUILD
=
@abs_top_builddir@
export
KEA
_FROM_BUILD
BIND10_MSGQ_SOCKET_FILE
=
@abs_top_builddir@/msgq_socket
export
BIND10_MSGQ_SOCKET_FILE
...
...
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