Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
450
Issues
450
List
Boards
Labels
Service Desk
Milestones
Merge Requests
75
Merge Requests
75
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
959f22ef
Commit
959f22ef
authored
Jun 13, 2014
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[3422] Fixes in the script to avoid bash complaints.
Also, a few corrections in Makefiles.
parent
1eecf8a6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
src/bin/dhcp4/tests/Makefile.am
src/bin/dhcp4/tests/Makefile.am
+3
-1
src/bin/dhcp6/tests/Makefile.am
src/bin/dhcp6/tests/Makefile.am
+3
-1
src/bin/keactrl/keactrl.in
src/bin/keactrl/keactrl.in
+3
-3
src/bin/keactrl/tests/Makefile.am
src/bin/keactrl/tests/Makefile.am
+3
-1
No files found.
src/bin/dhcp4/tests/Makefile.am
View file @
959f22ef
...
...
@@ -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
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
959f22ef
...
...
@@ -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
...
...
src/bin/keactrl/keactrl.in
View file @
959f22ef
...
...
@@ -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
...
...
src/bin/keactrl/tests/Makefile.am
View file @
959f22ef
...
...
@@ -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
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