diff --git a/.travis.yml b/.travis.yml index f13cf45eb..f874e6231 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +os: + - osx + - linux env: global: - GCC_BASE=gcc-arm-none-eabi-8-2018-q4-major @@ -9,13 +12,21 @@ addons: apt: packages: libc6-i386 octave-common octave gnuplot sox p7zip-full python3-numpy octave-signal valgrind + homebrew: + packages: + - p7zip + - octave + - sox + - valgrind + update: true cache: directories: - "$HOME/$GCC_BASE" install: +- if [ $TRAVIS_OS_NAME = linux ]; then export GCC_OS=linux ; else GCC_OS=mac; fi - export GCC_DIR=$HOME/$GCC_BASE -- export GCC_ARCHIVE=$HOME/$GCC_BASE-linux.tar.bz2 -- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-linux.tar.bz2 +- export GCC_ARCHIVE=$HOME/$GCC_BASE-$GCC_OS.tar.bz2 +- export GCC_URL=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/$GCC_SHORT/$GCC_BASE-$GCC_OS.tar.bz2 - if [ ! -e $GCC_DIR/bin/arm-none-eabi-g++ ]; then wget -q $GCC_URL -O $GCC_ARCHIVE; tar xfj $GCC_ARCHIVE -C $HOME; fi - export CODEC2DEV=${PWD} @@ -26,6 +37,7 @@ install: - if [ ! "$STDLIBURL" == "" ]; then pwd; wget -q $STDLIBURL; 7z x -p$STDLIBKEY -o$HOME stdperiph_lib.zip; fi - unset STDLIBURL STDLIBKEY # DO NOT TOUCH +- if [ $TRAVIS_OS_NAME = osx ]; then python3 -m pip install numpy && echo "pkg install -forge control signal" | octave-cli ; fi script: - mkdir -p $BUILDSTD - cd $BUILDSTD @@ -48,4 +60,4 @@ before_install: && rm -f /tmp/ut_travis; fi - unset KEY_K KEY_IV -# DO NOT TOUCH END \ No newline at end of file +# DO NOT TOUCH END diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 6e99aa5b6..a7ed77704 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -38,6 +38,7 @@ if (CMAKE_C_COMPILER MATCHES "gcc$") else() target_link_libraries(ofdm_stack function_trace m -no-pie) target_compile_options(ofdm_stack PUBLIC -finstrument-functions -no-pie) + target_link_libraries(ofdm_stack function_trace m -no-pie) endif() add_definitions(-D__UNITTEST__)