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
426
Issues
426
List
Boards
Labels
Service Desk
Milestones
Merge Requests
66
Merge Requests
66
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
e620bcab
Commit
e620bcab
authored
Sep 29, 2017
by
Francis Dupont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[5210] Put KEA_SHELL option in parent
parent
cdfbc195
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
32 deletions
+8
-32
src/bin/Makefile.am
src/bin/Makefile.am
+5
-1
src/bin/shell/Makefile.am
src/bin/shell/Makefile.am
+1
-13
src/bin/shell/tests/Makefile.am
src/bin/shell/tests/Makefile.am
+2
-18
No files found.
src/bin/Makefile.am
View file @
e620bcab
# The following build order must be maintained.
SUBDIRS
=
dhcp4 dhcp6 d2 agent perfdhcp admin lfc keactrl shell
SUBDIRS
=
dhcp4 dhcp6 d2 agent perfdhcp admin lfc keactrl
if
KEA_SHELL
SUBDIRS
+=
shell
endif
check-recursive
:
all-recursive
src/bin/shell/Makefile.am
View file @
e620bcab
SUBDIRS
=
.
tests
EXTRA_DIST
=
if
KEA_SHELL
# Kea-shell is enabled, here are proper rules for it.
pkgpython_PYTHON
=
kea_conn.py kea_connector2.py kea_connector3.py
sbin_SCRIPTS
=
kea-shell
else
# Kea-shell is disabled, simply keep the files for make dist
EXTRA_DIST
+=
kea-shell kea_conn.py kea_connector2.py kea_connector3.py
endif
CLEANFILES
=
*
.pyc
man_MANS
=
kea-shell.8
DISTCLEANFILES
=
$(man_MANS)
EXTRA_DIST
+
=
$(man_MANS)
kea-shell.xml
EXTRA_DIST
=
$(man_MANS)
kea-shell.xml
if
GENERATE_DOCS
kea-shell.8
:
kea-shell.xml
...
...
src/bin/shell/tests/Makefile.am
View file @
e620bcab
PYTESTS
=
SHTESTS
=
EXTRA_DIST
=
if
KEA_SHELL
# Ok, shell is enabled. Let's run those tests.
PYTESTS
+=
shell_unittest.py
SHTESTS
+=
shell_process_tests.sh
PYTESTS
=
shell_unittest.py
SHTESTS
=
shell_process_tests.sh
noinst_SCRIPTS
=
$(PYTESTS)
$(SHTESTS)
# test using command-line arguments, so use check-local target instead of TESTS
...
...
@@ -27,15 +20,6 @@ check-shell:
${SHELL}
$(abs_builddir)
/
$$
shtest
||
exit
;
\
done
else
# Nope, shell is disabled. Let's keep the files in EXTRA_DIST, so they get
# included in make dist, but don't do anything special about them.
EXTRA_DIST
+=
shell_unittest.py shell_process_tests.sh
endif
CLEANDIRS
=
__pycache__
clean-local
:
...
...
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