diff options
Diffstat (limited to 'other')
| -rwxr-xr-x | other/travis/hstox-install | 18 | ||||
| -rwxr-xr-x | other/travis/hstox-script | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/other/travis/hstox-install b/other/travis/hstox-install index f9d0f7b6..fccae0be 100755 --- a/other/travis/hstox-install +++ b/other/travis/hstox-install | |||
| @@ -8,16 +8,12 @@ cabal update | |||
| 8 | # install. | 8 | # install. |
| 9 | cabal install happy | 9 | cabal install happy |
| 10 | 10 | ||
| 11 | # Fetch hstox. | 11 | # Fetch hstox and msgpack-c. |
| 12 | git clone --recursive --depth=1 https://github.com/TokTok/hstox ../hstox | 12 | git clone --recursive --depth=1 https://github.com/TokTok/hs-toxcore ../hs-toxcore |
| 13 | git clone --depth=1 https://github.com/msgpack/msgpack-c testing/hstox/msgpack-c | ||
| 13 | 14 | ||
| 14 | # Delete all files in the cloned toxcore. | 15 | # Install the hstox test runner. |
| 15 | rm -rf ../hstox/test/toxcore/toxcore/toxcore | 16 | (cd ../hs-toxcore && cabal install --disable-library-profiling) |
| 16 | # Move the toxcore source files to the hstox test directory. | ||
| 17 | # The reason we move source files instead of the whole git root directory is | ||
| 18 | # that the travis scripts (like this one) need to remain in place. | ||
| 19 | mv toxcore ../hstox/test/toxcore/toxcore | ||
| 20 | 17 | ||
| 21 | # In the "install" step, we only run configure, which downloads the required | 18 | # Install toxcore dependencies. |
| 22 | # packages. In the "script" step we then build the actual code. | 19 | . other/travis/toxcore-linux-install |
| 23 | make -C ../hstox configure | ||
diff --git a/other/travis/hstox-script b/other/travis/hstox-script index 0c1953cb..a75c477b 100755 --- a/other/travis/hstox-script +++ b/other/travis/hstox-script | |||
| @@ -1,3 +1,3 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | make -C ../hstox check-toxcore | 3 | make -C testing/hstox check |