From 06070794b6b115674c456c6044874343a9144a40 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Thu, 19 Dec 2019 17:29:52 -0700
Subject: [PATCH] autobuild: move ocf_precompile under run_test.

Change-Id: I04caa5d24f6cddecc2a963de8c4fc7d0ad3bf470
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478544
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 autobuild.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/autobuild.sh b/autobuild.sh
index b7cfd45d7..dbdbd11b8 100755
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -22,7 +22,15 @@ cd $rootdir
 date -u
 git describe --tags
 
-if [ "$SPDK_TEST_OCF" -eq 1 ]; then
+./configure $config_params
+# Print some test system info out for the log
+echo "** START ** Info for Hostname: $HOSTNAME"
+uname -a
+$MAKE cc_version
+$MAKE cxx_version
+echo "** END ** Info for Hostname: $HOSTNAME"
+
+function ocf_precompile {
 	# We compile OCF sources ourselves
 	# They don't need to be checked with scanbuild and code coverage is not applicable
 	# So we precompile OCF now for further use as standalone static library
@@ -31,16 +39,10 @@ if [ "$SPDK_TEST_OCF" -eq 1 ]; then
 	CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/build/ocf.a
 	# Set config to use precompiled library
 	config_params="$config_params --with-ocf=/$rootdir/build/ocf.a"
-fi
+	# need to reconfigure to avoid clearing ocf related files on future make clean.
+	./configure $config_params
+}
 
-./configure $config_params
-
-# Print some test system info out for the log
-echo "** START ** Info for Hostname: $HOSTNAME"
-uname -a
-$MAKE cc_version
-$MAKE cxx_version
-echo "** END ** Info for Hostname: $HOSTNAME"
 
 if [ $SPDK_RUN_VALGRIND -eq 1 ]; then
 	run_test "valgrind" echo "using valgrind"
@@ -55,6 +57,10 @@ if [ $SPDK_RUN_UBSAN -eq 1 ]; then
 fi
 
 timing_enter autobuild
+if [ "$SPDK_TEST_OCF" -eq 1 ]; then
+	run_test "autobuild_ocf_precompile" ocf_precompile
+fi
+
 if [ $SPDK_RUN_CHECK_FORMAT -eq 1 ]; then
 	run_test "autobuild_check_format" ./scripts/check_format.sh
 fi