From ab47796ecad1a1bb15c634b26540e02a739ba685 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 19 Dec 2019 17:49:11 -0700 Subject: [PATCH] autobuild: move porcelain check under run_test Change-Id: I1731e7806b1bf380656b78c1b0fd51711fe3cc68 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478547 Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Reviewed-by: Paul Luse Reviewed-by: Karol Latecki Tested-by: SPDK CI Jenkins --- autobuild.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 4e314113f..ee565899d 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -54,6 +54,14 @@ function make_fail_cleanup { false } +function porcelain_check { + if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then + echo "Generated files missing from .gitignore:" + git status --porcelain --ignore-submodules + exit 1 + fi +} + if [ $SPDK_RUN_VALGRIND -eq 1 ]; then run_test "valgrind" echo "using valgrind" fi @@ -87,14 +95,7 @@ else run_test "make" $MAKE $MAKEFLAGS fi -# Check for generated files that are not listed in .gitignore -timing_enter generated_files_check -if [ $(git status --porcelain --ignore-submodules | wc -l) -ne 0 ]; then - echo "Generated files missing from .gitignore:" - git status --porcelain --ignore-submodules - exit 1 -fi -timing_exit generated_files_check +run_test "autobuild_generated_files_check" porcelain_check # Check that header file dependencies are working correctly by # capturing a binary's stat data before and after touching a