Commit 959f22ef authored by Marcin Siodelski's avatar Marcin Siodelski

[3422] Fixes in the script to avoid bash complaints.

Also, a few corrections in Makefiles.
parent 1eecf8a6
......@@ -34,7 +34,7 @@ check-local:
for shtest in $(SHTESTS) ; do \
echo Running test: $$shtest ; \
export B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir); \
$(abs_srcdir)/$$shtest || exit ; \
${SHELL} $(abs_srcdir)/$$shtest || exit ; \
done
......@@ -52,6 +52,8 @@ CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
CLEANFILES += $(builddir)/load_marker.txt $(builddir)/unload_marker.txt
CLEANFILES += *.json *.log
DISTCLEANFILES = dhcp4_process_tests.sh
AM_CXXFLAGS = $(B10_CXXFLAGS)
if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
......
......@@ -33,7 +33,7 @@ check-local:
for shtest in $(SHTESTS) ; do \
echo Running test: $$shtest ; \
export B10_LOCKFILE_DIR_FROM_BUILD=$(abs_top_builddir); \
$(abs_srcdir)/$$shtest || exit ; \
${SHELL} $(abs_srcdir)/$$shtest || exit ; \
done
......@@ -48,6 +48,8 @@ CLEANFILES = $(builddir)/interfaces.txt $(builddir)/logger_lockfile
CLEANFILES += $(builddir)/load_marker.txt $(builddir)/unload_marker.txt
CLEANFILES += *.json *.log
DISTCLEANFILES = dhcp6_process_tests.sh
AM_CXXFLAGS = $(B10_CXXFLAGS)
if USE_CLANGPP
# Disable unused parameter warning caused by some Boost headers when compiling with clang
......
......@@ -184,15 +184,15 @@ case ${command} in
start)
args="-c ${kea_config_file}"
if [ ${kea_verbose} == "yes" ]; then
if [ "${kea_verbose}" = "yes" ]; then
args="${args} -v"
fi
if [ ${kea4} == "yes" ]; then
if [ "${kea4}" = "yes" ]; then
start_server ${dhcpv4_srv} "${args}"
fi
if [ ${kea6} == "yes" ]; then
if [ "${kea6}" = "yes" ]; then
start_server ${dhcpv6_srv} "${args}"
fi
......
......@@ -5,14 +5,16 @@ SHTESTS = keactrl_tests.sh
noinst_SCRIPTS = keactrl_tests.sh
CLEANFILES = *.log *.json
DISTCLEANFILES = keactrl_tests.sh
EXTRA_DIST = keactrl_tests.sh.in
# Execute all test scripts.
check-local:
for shtest in $(SHTESTS) ; do \
echo Running test: $$shtest ; \
chmod +x $(abs_builddir)/$$shtest ; \
export KEACTRL_BUILD_DIR=$(abs_top_builddir); \
export KEACTRL_CONF=$(abs_top_builddir)/src/bin/keactrl/tests/keactrl_test.conf; \
$(abs_builddir)/$$shtest || exit ; \
${SHELL} $(abs_builddir)/$$shtest || exit ; \
done
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment