Travis container tests

This commit is contained in:
Olof Hagsand 2019-02-11 16:10:43 +01:00
parent 96b7fd7485
commit b023c6cbed
4 changed files with 7 additions and 13 deletions

View file

@ -144,7 +144,7 @@ example:
# Run a clixon test container. # Run a clixon test container.
# Alt: cd test; ./all.sh # Alt: cd test; ./all.sh
test: test:
(cd docker/system && $(MAKE) $(MFLAGS) test) (cd docker && $(MAKE) $(MFLAGS) test)
docker: docker:
for i in docker; \ for i in docker; \

View file

@ -44,7 +44,7 @@ SUBDIRS = base
SUBDIRS += system SUBDIRS += system
#SUBDIRS += cluster #SUBDIRS += cluster
.PHONY: all clean distclean depend install-include install uninstall .PHONY: all clean distclean depend install-include install uninstall test
all: $(SUBDIRS) all: $(SUBDIRS)
@ -53,6 +53,9 @@ clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend
test:
(cd system && $(MAKE) $(MFLAGS) test)
depend: depend:
install-include: install-include:

View file

@ -1,4 +1,4 @@
# Clixon and dockers # Clixon container images
This directory contains sub-directories with examples of Clixon docker images: This directory contains sub-directories with examples of Clixon docker images:

View file

@ -1,14 +1,5 @@
#!/bin/sh #!/bin/sh
# Travis pre-config script. # Travis pre-config script.
# Clone and install CLIgen # Clone and install CLIgen (needed for clixon configure and make)
git clone https://github.com/olofhagsand/cligen.git git clone https://github.com/olofhagsand/cligen.git
(cd cligen && ./configure && make && sudo make install) (cd cligen && ./configure && make && sudo make install)
#./configure && make && sudo make install
#sudo /sbin/ldconfig
#sudo make install-include
#(cd example && make && sudo make install)
#sudo groupadd clicon
#sudo usermod -a -G clicon $(whoami)
#sudo usermod -a -G clicon www-data
# Build the system docker container (make test may trigger it)
(cd docker/system && make docker)