From a9911aa779f6e104fccb1f7b1569b4c981d4fcf5 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Mon, 11 Nov 2019 11:21:28 -0500 Subject: [PATCH] vpp: call 'make checkstyle' instead of checkstyle.sh Change-Id: I65a7412fbf76ac2c52fbe123420b574127d13d83 Signed-off-by: Dave Wallace --- jjb/vpp/include-raw-vpp-checkstyle.sh | 8 +++++--- jjb/vpp/include-raw-vpp-test-checkstyle.sh | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jjb/vpp/include-raw-vpp-checkstyle.sh b/jjb/vpp/include-raw-vpp-checkstyle.sh index 258c9e7e2..bc1e40871 100644 --- a/jjb/vpp/include-raw-vpp-checkstyle.sh +++ b/jjb/vpp/include-raw-vpp-checkstyle.sh @@ -1,7 +1,9 @@ #!/bin/bash +# jjb/vpp/include-raw-vpp-checkstyle.sh -if [ -f build-root/scripts/checkstyle.sh ];then - build-root/scripts/checkstyle.sh +if [ "$(grep -E '^checkstyle:' Makefile)" = "checkstyle:" ] +then + make checkstyle else - echo "Cannot find cat build-root/scripts/checkstyle.sh - skipping checkstyle" + echo "Can't find checkstyle target in Makefile - skipping checkstyle" fi diff --git a/jjb/vpp/include-raw-vpp-test-checkstyle.sh b/jjb/vpp/include-raw-vpp-test-checkstyle.sh index fd44cb60d..6cb6fac3e 100644 --- a/jjb/vpp/include-raw-vpp-test-checkstyle.sh +++ b/jjb/vpp/include-raw-vpp-test-checkstyle.sh @@ -1,8 +1,9 @@ #!/bin/bash +# jjb/vpp/include-raw-vpp-test-checkstyle.sh -if grep '.PHONY: checkstyle' test/Makefile > /dev/null +if [ "$(grep -E '^test-checkstyle:' Makefile)" = "test-checkstyle:" ] then make test-checkstyle else - echo "Can't find checkstyle target in test/Makefile - skipping test checkstyle" + echo "Can't find test-checkstyle target in Makefile - skipping test checkstyle" fi -- 2.16.6