ci: speed up code-coverage jobs
refs #3809
Change-Id: Ia811a5ca79ba9aa30744aa2269f681528446445f
diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index 8886aca..7f885fb 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -9,7 +9,7 @@
# Cleanup
sudo ./waf -j1 --color=yes distclean
-if [[ "$JOB_NAME" != *"limited-build" ]]; then
+if [[ $JOB_NAME != *"code-coverage" && $JOB_NAME != *"limited-build" ]]; then
# Configure/build in optimized mode with tests
./waf -j1 --color=yes configure --with-tests
./waf -j1 --color=yes build
@@ -26,7 +26,7 @@
fi
# Configure/build in debug mode with tests
-if [[ "$JOB_NAME" == *"code-coverage" ]]; then
+if [[ $JOB_NAME == *"code-coverage" ]]; then
COVERAGE="" # TODO add code coverage support
elif ! has OSX-10.9 $NODE_LABELS && ! has OSX-10.11 $NODE_LABELS; then
ASAN="--with-sanitizer=address"
diff --git a/.jenkins.d/README.md b/.jenkins.d/README.md
index 386e2db..085e383 100644
--- a/.jenkins.d/README.md
+++ b/.jenkins.d/README.md
@@ -9,17 +9,17 @@
The list should include at least `[OS_TYPE]`, `[DISTRO_TYPE]`, and `[DISTRO_VERSION]`.
- Possible values for Linux OS:
+ Possible values for Linux:
* `[OS_TYPE]`: `Linux`
* `[DISTRO_TYPE]`: `Ubuntu`
* `[DISTRO_VERSION]`: `Ubuntu-14.04`, `Ubuntu-16.04`
- Possible values of OSX OS:
+ Possible values for OS X / macOS:
* `[OS_TYPE]`: `OSX`
* `[DISTRO_TYPE]`: `OSX` (can be absent)
- * `[DISTRO_VERSION]`: `OSX-10.11`, `OSX-10.10`, `OSX-10.9`, `OSX-10.8`
+ * `[DISTRO_VERSION]`: `OSX-10.10`, `OSX-10.11`, `OSX-10.12`
- `JOB_NAME`: optional variable to define type of the job. Depending on the defined job type,
the build scripts can perform different tasks.
@@ -27,8 +27,8 @@
Possible values:
* empty: default build process
- * `code-coverage` (Linux OS is assumed): build process with code coverage analysis
- * `limited-build`: only a single build with tests
+ * `code-coverage` (Linux OS is assumed): debug build with tests and code coverage analysis
+ * `limited-build`: only a single debug build with tests
- `CACHE_DIR`: the variable defines a path to folder containing cached files from previous builds,
e.g., a compiled version of ndn-cxx library. If not set, `/tmp` is used.
diff --git a/.travis.yml b/.travis.yml
index 1066eb7..49058cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
sudo: required
language: generic
+env:
+ global:
+ - JOB_NAME=limited-build
matrix:
include:
- os: linux
diff --git a/AUTHORS.md b/AUTHORS.md
index 0cfab21..cbf1951 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -10,7 +10,7 @@
* Alexander Afanasyev <http://lasr.cs.ucla.edu/afanasyev/index.html>
* Davide Pesavento <http://www.lip6.fr/actualite/personnes-fiche.php?ident=D1469>
* Junxiao Shi <http://www.cs.arizona.edu/people/shijunxiao/>
-* Eric Newberry <http://ericnewberry.com/>
+* Eric Newberry <http://cs.arizona.edu/~enewberry/>
* Xiaoke Jiang <http://netarchlab.tsinghua.edu.cn/~shock/>
* Yingdi Yu <http://irl.cs.ucla.edu/~yingdi/>
* Qi Zhao <https://www.linkedin.com/pub/qi-zhao/73/835/9a3>