diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-05-12 14:40:36 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-05-12 15:17:07 +0200 |
| commit | 182867a07106b180e2b57f6aec6382a24bcdd531 (patch) | |
| tree | 35dd5742d488cb13f73d48c5494eb58c87d5aa42 | |
| parent | 241a7fdc4fc5f205e3553195ca0c27be44848261 (diff) | |
Reduced superfluous Travis-CI yaml content.1.3
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .travis.yml | 14 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index ef4490d1b..df3300587 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,13 @@ before_install: - sudo apt-get -qq update - sudo apt-get install -y build-essential make binutils gcc autoconf automake libtool pkg-config git libpcap-dev libgcrypt-dev libgpg-error-dev libjson-c-dev netcat-openbsd python3 python3-jsonschema script: -- git submodule update --init # static linked build -- mkdir build-cmake-submodule && cd build-cmake-submodule && cmake .. -DBUILD_EXAMPLES=ON -DBUILD_NDPI=ON -DENABLE_SANITIZER=ON && make && cd .. +- mkdir build-cmake-submodule && cd build-cmake-submodule && + cmake .. -DBUILD_EXAMPLES=ON -DBUILD_NDPI=ON -DENABLE_SANITIZER=ON && make && cd .. +- ./test/run_tests.sh ./libnDPI ./build-cmake-submodule/nDPId-test # pkg-config dynamic linked build -- PKG_CONFIG_PATH="$(realpath ./build-cmake-submodule/libnDPI/lib/pkgconfig)" cmake . -DBUILD_EXAMPLES=ON -DENABLE_SANITIZER=ON -DENABLE_MEMORY_PROFILING=ON && make -- ./nDPId-test || test $? -eq 1 -- ./nDPId -h || test $? -eq 1 -- ./test/run_tests.sh +- mkdir build && cd build && + PKG_CONFIG_PATH="$(realpath ../build-cmake-submodule/libnDPI/lib/pkgconfig)" + cmake .. -DBUILD_EXAMPLES=ON -DENABLE_SANITIZER=ON -DENABLE_MEMORY_PROFILING=ON && make && cd .. +- ./build/nDPId-test || test $? -eq 1 +- ./build/nDPId -h || test $? -eq 1 @@ -140,11 +140,11 @@ make nDPId-test test Alternatively you can run some integration tests manually: -`./test/run_tests.sh /path/to/libnDPI/root/directory` +`./test/run_tests.sh [/path/to/libnDPI/root/directory] [/path/to/nDPId-test]` e.g.: -`./test/run_tests.sh ${HOME}/git/nDPI` +`./test/run_tests.sh [${HOME}/git/nDPI] [${HOME}/git/nDPId/build/nDPId-test]` Remember that all test results are tied to a specific libnDPI commit hash as part of the `git submodule`. Using `test/run_tests.s` for other commit hashes |