added zcov integration to travis CI

2 files changed, 50 insertions, 10 deletions

diff --git a/.travis.yml b/.travis.yml
index c971a801..413b5b9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,23 +23,31 @@ env:
     #   UCLIBC: {ENABLED, DISABLED}
     # with Asserts enabled.
 
+    # COVERAGE set indicated that coverage data should be uplaoded to the server, only ONE job should have COVERAGE set
+
     # FIXME: Enable when we want to test LLVM3.5
+    matrix:
     #- LLVM_VERSION=3.5 STP_VERSION=UPSTREAM KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
     #- LLVM_VERSION=3.5 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=2.9 STP_VERSION=UPSTREAM KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=2.9 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=3.4 STP_VERSION=r940 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=3.4 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
-    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1
+    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=1
+    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=2.9 STP_VERSION=UPSTREAM KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=2.9 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=3.4 STP_VERSION=r940 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=3.4 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=0 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
+    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=1 COVERAGE=0
 
     # Check at least one build with Asserts disabled.
-    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=1 ENABLE_OPTIMIZED=1
+    - LLVM_VERSION=2.9 STP_VERSION=r940 KLEE_UCLIBC=1 DISABLE_ASSERTIONS=1 ENABLE_OPTIMIZED=1 COVERAGE=0
 
     # Check at least one Debug+Asserts build
-    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=0
+    - LLVM_VERSION=3.4 STP_VERSION=UPSTREAM KLEE_UCLIBC=1 DISABLE_ASSERTIONS=0 ENABLE_OPTIMIZED=0 COVERAGE=0
+    global:
+    - secure: I2KHdohEIIBFHv8WuBPNP6Tr/KlF2bZsJaErSjyQgL6m0oNGI/f0AzTD+8lwlxhYSdk8Zq0+4R8uqKi9Hx70gN/Jxh2vpO+cStysP7IEpuUGojRleU5yxw0G8hDd8qvgqR23ZRBriIRQp+5h1AR/7cW1FJ62u5M5kbZMEJXe4wChSrERt6hhOY3aWvBaoJEfyUsKMPrtPVkTtnsbO/rdlaIJ8I7Eh0tGiI5aHzziVyA56CjEnDszEbbtTky0AIzPOUzL5rjsUNgEGkDk4KvyfGf8Fe8bd2Uucm1Bdx5l6Q2vF8ugwhClwF0kZCnBuZ8iY1f8fO8JAd91cRf5D4Yp+UYV7+xKRD3qEGerXz2riWWpJFTtcK8Jp4ZiPmguRqx5pSMjn8tM9u4I0a+QsttynX7juMgn4Hd7HmXXzDnUPCbbXOqUxH8E6hRyJsK9t1n2db8fiBZ82nAQI5Iia0bSS5Ugv3y8rmT8QunFmKe0E+VhN6BmNE/xp+dEYKkNJw9Q6z2HxzLcMmSDxYMSINXIHMahfh7hkL+4o2oM/8EN8+D5k+bWhes9qPqFQvG2EgeaObXwG0rgdnwMKqXwcVtM3rj1r9hkXyOiRIOpo9t2B82EBgBs8Wkn+a36jKl2ol7KO9BqKRr9VDBTNugyDT9Gb/s/p1DncfNrRRdHbtH6BV4=
+    - secure: YTSCtmz2/1vaaM9Y/9sVuCSTCXW4zvstIGqcFRVI1lgcgOhsGPJ85NYylCL4p1yohkLgIpKKddsSNaY4S1iL9Dnpq02shD1I+Uuqa73+srlTCkPWrJjMyqXQd9lHGx2RI3POomrVZAn6zyowoCQh0DrNEf+CyKpysfnj9LujFjofrCFKBxOrWGaIVbV3Gb85Y7jsW/a3mBV4KyETzMqhh5K1YwRbvCOcmBdx+nAVZDzGQPd7AW49ExZeu9OJDDhhPkPPgt6zK4ynEmdKeoLMu9mlUDz++Z7HwQbkEGN+AYPjPde5vjQX9GM/0amVHjQsph4M80QnR5XsFUDPaaoj/K1vAQ3vKUs4UUeMN8XIuLP3psX4kPkK3B7aTZaoEsEA+6GdgGtCv5s4n/OMb29eBNaBZPp6NpeTPilmYEdI0vAB4BH0gRbmYqxqsyF0KyWvUYUiGWwt2jVreqZpJNX79fNoykT+kYoo+iW3otBGC9uTew4VgBK6tk1nOycfrEBzz0lU44ov/VIMikXYCT3D9dYgemdwqvmzi2YV5xQWPJRDIt96oTBEYg7GIInTERQKqLDAjhZX8QdRj0/3Gkfe3HbB3JDAPYKl2Oc58mD37hURk7onJsdtVUfgiF2uLx7uQ3qr7ji668FKMRKknQ4qox1QBN7dypXbADIhENh6bFo=
+    - secure: ZfcC3mJaJooj3JkNKGTbTjiThidtexAuBOZ5NBu9x2+Nq8zX/rEbzYTmTlfj57UsZj27aQXgI9tCgLshodSgKF90Y+kLf5I3p2o6xIXxwzvClmFLiG5+Jxfdod2IJ4xQpwoj9lGzC+7+iPkfqnwdYKPNWdcOFPYZ4fMmvD6MqP9P+7njEGtE0XTfflmlEPySs471hlXGTFGea5EDSYcY2zrkycKh+PfXmT9u4f46bEqyQP4bAffsZy4WrrrFrNEkQGZsO3xdSLZs6MsmlG++HAIq3IqSHG2/IsB0XYC1nqZGxkCSIHCqdqY1MmaaNhYpS4dWhhQNabsAd1Nnvo/i2gsu+Ll4E6WuGI4WN9ha5Y8rJZ06Oo/qjqVLE3r0L4bM4M5o4qYPdNyIuDRDW1gyMZN1AGO6ArdYoyPYhIQDRcYLtZt0qaM7hNjZ5iolSDXVk1OF/pjL+vNqiiPWb1EHxE/IRygeDca58EjSVJIr4LW+QwfjakRZtFqyqzrM8uAW0AfEQMOKdGA7YhRXNCg4/hkZMuAvO4daea5Xh8nbht2RQQ9r2hLfHbIgd4030aQnfk0HueNi3LVPkZDBmLM4OY/MOACZDFZQ1JLv+dg8wAblJ5NnLbLUg4pfEgCbZQICPW5j5xUqLqFFhwE4TYaTOjGsy+LkMdK0EasyPUwZhhs=
+
 cache: apt
 before_install:
     ###########################################################################
diff --git a/.travis/klee.sh b/.travis/klee.sh
index 3106dca9..9aa6b1af 100755
--- a/.travis/klee.sh
+++ b/.travis/klee.sh
@@ -55,6 +55,7 @@ ${KLEE_SRC}/configure --with-llvmsrc=/usr/lib/llvm-${LLVM_VERSION}/build \
             --with-llvmcxx=${KLEE_CXX} \
             --with-stp="${BUILD_DIR}/stp/build" \
             ${KLEE_UCLIBC_CONFIGURE_OPTION} \
+            CXXFLAGS="-fprofile-arcs -ftest-coverage" \
             && make DISABLE_ASSERTIONS=${DISABLE_ASSERTIONS} \
                     ENABLE_OPTIMIZED=${ENABLE_OPTIMIZED} \
                     ENABLE_SHARED=0
@@ -94,6 +95,37 @@ set +e # We want to let all the tests run before we exit
 lit -v .
 RETURN="${RETURN}$?"
 
+#generate and upload coverage if COVERAGE is set
+if [ ${COVERAGE} -eq 1 ]; then
+
+#get zcov that works with gcov v4.8
+    git clone https://github.com/kren1/zcov.git 
+    cd zcov
+    sudo python setup.py install
+    sudo mkdir /usr/local/lib/python2.7/dist-packages/zcov-0.3.0.dev0-py2.7.egg/zcov/js
+    cd zcov
+
+#these files are not where zcov expects them to be after install so we move them
+    sudo cp js/sorttable.js /usr/local/lib/python2.7/dist-packages/zcov-0.3.0.dev0-py2.7.egg/zcov/js/sorttable.js 
+    sudo cp js/sourceview.js /usr/local/lib/python2.7/dist-packages/zcov-0.3.0.dev0-py2.7.egg/zcov/js/sourceview.js 
+    sudo cp style.css /usr/local/lib/python2.7/dist-packages/zcov-0.3.0.dev0-py2.7.egg/zcov/style.css
+
+#install zcov dependency
+    sudo apt-get install enscript
+
+#update gcov from v4.6 to v4.8. This is becauase gcda files are made for v4.8 and cause 
+#a segmentation fault in v4.6
+    sudo apt-get install ggcov
+    sudo rm /usr/bin/gcov
+    sudo ln -s /usr/bin/gcov-4.8 /usr/bin/gcov
+
+#scan and generate coverage
+    zcov scan output.zcov ${BUILD_DIR}
+    zcov genhtml output.zcov coverage/
+#upload the coverage data, currently to a random ftp server
+    tar -zcvf coverage.tar.gz coverage/
+    curl --form "file=@coverage.tar.gz" -u ${USER}:${PASSWORD} ${COVERAGE_SERVER}
+fi
 ###############################################################################
 # Result
 ###############################################################################