Skip to content

Commit

Permalink
Fix Travis, Makefile, doxygen for new directory structure
Browse files Browse the repository at this point in the history
  • Loading branch information
awlane committed Jun 21, 2018
1 parent 25a47a3 commit 434dd19
Show file tree
Hide file tree
Showing 3 changed files with 596 additions and 596 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install:

script:
- sudo mn --wifi --test pingall
- sudo python mininet/test/runner.py -v -quick
- sudo python mn_wifi/test/runner.py -v -quick
#- sudo python examples/test/runner.py -v -quick

notifications:
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
MININET = mininet/*.py
MININET_WIFI = mininet/wifi/*.py
TEST = mininet/test/*.py
EXAMPLES = mininet/examples/*.py
MININET = mininet-base/mininet/*.py
MININET_WIFI = mn_wifi/*.py
TEST = mn_wifi/test/*.py
EXAMPLES = mn_wifi/examples/*.py
MN = bin/mn
PYMN = python -B bin/mn
BIN = $(MN)
Expand Down Expand Up @@ -36,15 +36,15 @@ errcheck: $(PYSRC)

test: $(MININET) $(TEST)
-echo "Running tests"
mininet/test/test_nets.py
mininet/test/test_hifi.py
mn_wifi/test/test_nets.py
mn_wifi/test/test_hifi.py

slowtest: $(MININET)
-echo "Running slower tests (walkthrough, examples)"
mininet/test/test_walkthrough.py -v
mininet/examples/test/runner.py -v
mn_wifi/test/test_walkthrough.py -v
mn_wifi/examples/test/runner.py -v

mnexec: mnexec.c $(MN) mininet/net.py
mnexec: mnexec.c $(MN) mininet-base/mininet/net.py
cc $(CFLAGS) $(LDFLAGS) -DVERSION=\"`PYTHONPATH=. $(PYMN) --version`\" $< -o $@

install: $(MNEXEC) $(MANPAGES)
Expand Down
Loading

0 comments on commit 434dd19

Please sign in to comment.