From 35f008161dff9670cf84e25c59288780d47ef0b1 Mon Sep 17 00:00:00 2001 From: Tomek Mrugalski Date: Wed, 6 Aug 2014 12:46:00 +0200 Subject: [PATCH] [3417] shell scripts updated (B10_ => KEA_) --- src/lib/log/tests/init_logger_test.sh.in | 16 ++++++++-------- src/lib/log/tests/logger_lock_test.sh.in | 2 +- src/lib/testutils/dhcp_test_lib.sh.in | 2 +- src/lib/util/unittests/run_all.cc | 2 +- tests/lettuce/setup_intree_bind10.sh.in | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/log/tests/init_logger_test.sh.in b/src/lib/log/tests/init_logger_test.sh.in index eef521dda3..673f82312a 100755 --- a/src/lib/log/tests/init_logger_test.sh.in +++ b/src/lib/log/tests/init_logger_test.sh.in @@ -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 $? diff --git a/src/lib/log/tests/logger_lock_test.sh.in b/src/lib/log/tests/logger_lock_test.sh.in index 19a6a4fd52..50649b91ac 100755 --- a/src/lib/log/tests/logger_lock_test.sh.in +++ b/src/lib/log/tests/logger_lock_test.sh.in @@ -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 $? diff --git a/src/lib/testutils/dhcp_test_lib.sh.in b/src/lib/testutils/dhcp_test_lib.sh.in index 5d0631e09a..f8f3bb9844 100644 --- a/src/lib/testutils/dhcp_test_lib.sh.in +++ b/src/lib/testutils/dhcp_test_lib.sh.in @@ -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. diff --git a/src/lib/util/unittests/run_all.cc b/src/lib/util/unittests/run_all.cc index 80555ba798..9ac9d56461 100644 --- a/src/lib/util/unittests/run_all.cc +++ b/src/lib/util/unittests/run_all.cc @@ -45,7 +45,7 @@ run_all() { if (keatest_catch_exception != NULL) { if (strcmp(keatest_catch_exception, "1") == 0) { catch_exception = true; - } else if (strcmp(b10test_catch_exception, "0") == 0) { + } else if (strcmp(keatest_catch_exception, "0") == 0) { catch_exception = false; } else { std::cerr << "***ERROR: KEATEST_CATCH_EXCEPTION is '" diff --git a/tests/lettuce/setup_intree_bind10.sh.in b/tests/lettuce/setup_intree_bind10.sh.in index d23c13ae55..970021b107 100755 --- a/tests/lettuce/setup_intree_bind10.sh.in +++ b/tests/lettuce/setup_intree_bind10.sh.in @@ -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 -- 2.47.2