summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2017-02-03 20:54:03 +0000
committerGerrit Code Review <gerrit@fd.io>2017-02-03 20:54:03 +0000
commit4b442efa96868ff1f1a879a33464f759044ff5e7 (patch)
tree02fca1a9d026c558f8c3c75dc8d34de150e7ac16
parent3ad4671d5de987b580ec8b65215b428595febcc1 (diff)
parent0e2ae5b15c174f16f3ec7c04748ace91d1c8984f (diff)
Merge "Add make test-checkstyle"
-rw-r--r--jjb/vpp/include-raw-vpp-test-checkstyle.sh8
-rw-r--r--jjb/vpp/vpp.yaml2
2 files changed, 10 insertions, 0 deletions
diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
new file mode 100644
index 000000000..fd44cb60d
--- /dev/null
+++ b/jjb/vpp/include-raw-vpp-test-checkstyle.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if grep '.PHONY: checkstyle' test/Makefile > /dev/null
+then
+ make test-checkstyle
+else
+ echo "Can't find checkstyle target in test/Makefile - skipping test checkstyle"
+fi
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f8b52caa8..bc1d5597d 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -106,6 +106,8 @@
- shell:
!include-raw-escape: include-raw-vpp-checkstyle.sh
- shell:
+ !include-raw-escape: include-raw-vpp-test-checkstyle.sh
+ - shell:
!include-raw-escape: include-raw-vpp-build.sh
publishers:
- archive: