modify travis-ci

diff --git a/.travis.yml b/.travis.yml
index c25257cd294efde22e7a6a71846fea191320694e..fc31f22786c45be9c17ecec0f0342e7a2d05a44c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,9 @@ env:
     #- REMOTE=enable CMAKE=no
     #- ENABLE_REMOTE="-DENABLE_REMOTE=ON" CMAKE=yes
     # test when DPDK is enabled
-    - ENABLE_DPDK=yes REMOTE=disable CMAKE=no
+    - ENABLE_DPDK=yes ENABLE_REMOTE="" CMAKE=yes
     # when CMAKE=no, compile error but I don know why
-    #- ENABLE_DPDK=yes ENABLE_REMOTE="" CMAKE=yes
+    - ENABLE_DPDK=yes REMOTE=disable CMAKE=no
     #- ENABLE_DPDK=yes REMOTE=enable CMAKE=no
     #- ENABLE_DPDK=yes ENABLE_REMOTE="-DENABLE_REMOTE=ON" CMAKE=yes
 
@@ -71,11 +71,14 @@ before_install:
 install:
 
 before_script:
+  - echo -n travis_fold:start:before_script.dpdk_install
   # install linux kernel header for dpdk
   - sudo apt-get install linux-headers-`uname -r`
   # build dpdk and install it to /usr/local/
   - if [ "$ENABLE_DPDK" = yes ]; then git clone https://github.com/DPDK/dpdk.git /tmp/dpdk && export RTE_SDK=/tmp/dpdk && export RTE_TARGET=build && cd /tmp/dpdk/ && make defconfig && sed -i 's/CONFIG_RTE_BUILD_SHARED_LIB=n/CONFIG_RTE_BUILD_SHARED_LIB=y/' $RTE_SDK/$RTE_TARGET/.config && make -s all && sudo make install && cd - ; fi
-  - if [ "$ENABLE_DPDK" = yes ]; then if [ "$CMAKE" = yes ]; then export DPDK_OPT="-DCMAKE_INSTALL_PREFIX=/tmp -DDISABLE_DPDK=OFF -DDPDK_INC_DIR=$RTE_SDK/$RTE_TARGET/include/dpdk -DDPDK_LIB_DIR=$RTE_SDK/$RTE_TARGET/lib"  ;else export DPDK_OPT="--enable-dpdk --with-dpdk-includes=$RTE_SDK/$RTE_TARGET/include/dpdk --with-dpdk-libraries=$RTE_SDK/$RTE_TARGET/lib" ; fi ; fi ; echo -n "DPDK_OPT=${DPDK_OPT}"
+  - echo -n travis_fold:end:before_script.dpdk_install
+  - if [ "$ENABLE_DPDK" = yes ]; then if [ "$CMAKE" = yes ]; then export DPDK_OPT="-DCMAKE_INSTALL_PREFIX=/tmp -DDISABLE_DPDK=OFF -DDPDK_INC_DIR=/usr/local/include/dpdk -DDPDK_LIB_DIR=/usr/local/lib" ;else export DPDK_OPT="--enable-dpdk --with-dpdk-includes=/usr/local/include/dpdk --with-dpdk-libraries=/usr/local/lib" ; fi ; fi 
+  - echo -n "DPDK_OPT=${DPDK_OPT}"
 
 script:
   - if [ "$COVERITY_SCAN_BRANCH" = 1 ]; then exit 0; fi