From d72cda543c01d44f0b3e61f4cb38fd16a28d5665 Mon Sep 17 00:00:00 2001 From: Cosmin Truta Date: Wed, 14 Sep 2022 21:56:47 +0300 Subject: ci: Trace the paths of executable files found on the build machine Also add markers to trace the boundaries of configuration and build steps. --- ci/ci_autotools.sh | 46 ++++++++++++++++++++++++++--------------- ci/ci_cmake.sh | 60 ++++++++++++++++++++++++++++++++++-------------------- ci/ci_legacy.sh | 48 +++++++++++++++++++++++++++---------------- 3 files changed, 99 insertions(+), 55 deletions(-) diff --git a/ci/ci_autotools.sh b/ci/ci_autotools.sh index b141e7fca..0728540bd 100755 --- a/ci/ci_autotools.sh +++ b/ci/ci_autotools.sh @@ -45,29 +45,43 @@ function ci_init_autotools { } function ci_trace_autotools { + ci_info "## START OF CONFIGURATION ##" ci_info "system name: $CI_SYSTEM_NAME" ci_info "machine hardware name: $CI_MACHINE_NAME" ci_info "source directory: $CI_SRCDIR" ci_info "build directory: $CI_BUILDDIR" ci_info "install directory: $CI_INSTALLDIR" - ci_info "environment option: \$CI_CONFIGURE_FLAGS='$CI_CONFIGURE_FLAGS'" - ci_info "environment option: \$CI_MAKE='$CI_MAKE'" - ci_info "environment option: \$CI_MAKE_FLAGS='$CI_MAKE_FLAGS'" - ci_info "environment option: \$CI_CC='$CI_CC'" - ci_info "environment option: \$CI_CC_FLAGS='$CI_CC_FLAGS'" - ci_info "environment option: \$CI_CPP='$CI_CPP'" - ci_info "environment option: \$CI_CPP_FLAGS='$CI_CPP_FLAGS'" - ci_info "environment option: \$CI_AR='$CI_AR'" - ci_info "environment option: \$CI_RANLIB='$CI_RANLIB'" - ci_info "environment option: \$CI_LD='$CI_LD'" - ci_info "environment option: \$CI_LD_FLAGS='$CI_LD_FLAGS'" - ci_info "environment option: \$CI_SANITIZERS='$CI_SANITIZERS'" - ci_info "environment option: \$CI_NO_TEST='$CI_NO_TEST'" - ci_info "environment option: \$CI_NO_INSTALL='$CI_NO_INSTALL'" - ci_info "environment option: \$CI_NO_CLEAN='$CI_NO_CLEAN'" + ci_info "environment option: \$CI_CONFIGURE_FLAGS: '$CI_CONFIGURE_FLAGS'" + ci_info "environment option: \$CI_MAKE: '$CI_MAKE'" + ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'" + ci_info "environment option: \$CI_CC: '$CI_CC'" + ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'" + ci_info "environment option: \$CI_CPP: '$CI_CPP'" + ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'" + ci_info "environment option: \$CI_AR: '$CI_AR'" + ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'" + ci_info "environment option: \$CI_LD: '$CI_LD'" + ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'" + ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'" + ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'" + ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'" + ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'" + ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")" + [[ $CI_CC ]] && + ci_info "executable: \$CI_CC: $(command -V "$CI_CC")" + [[ $CI_CPP ]] && + ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")" + [[ $CI_AR ]] && + ci_info "executable: \$CI_AR: $(command -V "$CI_AR")" + [[ $CI_RANLIB ]] && + ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")" + [[ $CI_LD ]] && + ci_info "executable: \$CI_LD: $(command -V "$CI_LD")" + ci_info "## END OF CONFIGURATION ##" } function ci_build_autotools { + ci_info "## START OF BUILD ##" # Export the configure build environment. [[ $CI_CC ]] && ci_spawn export CC="$CI_CC" [[ $CI_CC_FLAGS ]] && ci_spawn export CFLAGS="$CI_CC_FLAGS" @@ -91,7 +105,7 @@ function ci_build_autotools { [[ $CI_NO_INSTALL ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS install [[ $CI_NO_CLEAN ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS clean [[ $CI_NO_CLEAN ]] || ci_spawn "$CI_MAKE" $CI_MAKE_FLAGS distclean - ci_info "success!" + ci_info "## END OF BUILD ##" } ci_init_autotools diff --git a/ci/ci_cmake.sh b/ci/ci_cmake.sh index f38ec6ff8..71af270da 100755 --- a/ci/ci_cmake.sh +++ b/ci/ci_cmake.sh @@ -66,35 +66,51 @@ function ci_init_cmake { } function ci_trace_cmake { + ci_info "## START OF CONFIGURATION ##" ci_info "system name: $CI_SYSTEM_NAME" ci_info "machine hardware name: $CI_MACHINE_NAME" ci_info "source directory: $CI_SRCDIR" - [[ $CI_SRCDIR_NATIVE ]] && ci_info "source directory (native): $CI_SRCDIR_NATIVE" + [[ $CI_SRCDIR_NATIVE ]] && + ci_info "source directory (native): $CI_SRCDIR_NATIVE" ci_info "build directory: $CI_BUILDDIR" - [[ $CI_BUILDDIR_NATIVE ]] && ci_info "build directory (native): $CI_BUILDDIR_NATIVE" + [[ $CI_BUILDDIR_NATIVE ]] && + ci_info "build directory (native): $CI_BUILDDIR_NATIVE" ci_info "install directory: $CI_INSTALLDIR" - [[ $CI_INSTALLDIR_NATIVE ]] && ci_info "install directory (native): $CI_INSTALLDIR_NATIVE" - ci_info "environment option: \$CI_CMAKE='$CI_CMAKE'" - ci_info "environment option: \$CI_CMAKE_GENERATOR='$CI_CMAKE_GENERATOR'" - ci_info "environment option: \$CI_CMAKE_GENERATOR_PLATFORM='$CI_CMAKE_GENERATOR_PLATFORM'" - ci_info "environment option: \$CI_CMAKE_BUILD_TYPE='$CI_CMAKE_BUILD_TYPE'" - ci_info "environment option: \$CI_CMAKE_BUILD_FLAGS='$CI_CMAKE_BUILD_FLAGS'" - ci_info "environment option: \$CI_CMAKE_VARS='$CI_CMAKE_VARS'" - ci_info "environment option: \$CI_CTEST='$CI_CTEST'" - ci_info "environment option: \$CI_CTEST_FLAGS='$CI_CTEST_FLAGS'" - ci_info "environment option: \$CI_CC='$CI_CC'" - ci_info "environment option: \$CI_CC_FLAGS='$CI_CC_FLAGS'" - ci_info "environment option: \$CI_AR='$CI_AR'" - ci_info "environment option: \$CI_RANLIB='$CI_RANLIB'" - ci_info "environment option: \$CI_SANITIZERS='$CI_SANITIZERS'" - ci_info "environment option: \$CI_NO_TEST='$CI_NO_TEST'" - ci_info "environment option: \$CI_NO_INSTALL='$CI_NO_INSTALL'" - ci_info "environment option: \$CI_NO_CLEAN='$CI_NO_CLEAN'" - ci_spawn "$(command -v "$CI_CMAKE")" --version - ci_spawn "$(command -v "$CI_CTEST")" --version + [[ $CI_INSTALLDIR_NATIVE ]] && + ci_info "install directory (native): $CI_INSTALLDIR_NATIVE" + ci_info "environment option: \$CI_CMAKE: '$CI_CMAKE'" + ci_info "environment option: \$CI_CMAKE_GENERATOR: '$CI_CMAKE_GENERATOR'" + ci_info "environment option: \$CI_CMAKE_GENERATOR_PLATFORM: '$CI_CMAKE_GENERATOR_PLATFORM'" + ci_info "environment option: \$CI_CMAKE_BUILD_TYPE: '$CI_CMAKE_BUILD_TYPE'" + ci_info "environment option: \$CI_CMAKE_BUILD_FLAGS: '$CI_CMAKE_BUILD_FLAGS'" + ci_info "environment option: \$CI_CMAKE_VARS: '$CI_CMAKE_VARS'" + ci_info "environment option: \$CI_CTEST: '$CI_CTEST'" + ci_info "environment option: \$CI_CTEST_FLAGS: '$CI_CTEST_FLAGS'" + ci_info "environment option: \$CI_CC: '$CI_CC'" + ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'" + ci_info "environment option: \$CI_AR: '$CI_AR'" + ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'" + ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'" + ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'" + ci_info "environment option: \$CI_NO_INSTALL: '$CI_NO_INSTALL'" + ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'" + ci_info "executable: \$CI_CMAKE: $(command -V "$CI_CMAKE")" + ci_info "executable: \$CI_CTEST: $(command -V "$CI_CTEST")" + [[ $CI_CMAKE_GENERATOR == *"Ninja"* ]] && + ci_info "executable: $(command -V ninja)" + [[ $CI_CC ]] && + ci_info "executable: \$CI_CC: $(command -V "$CI_CC")" + [[ $CI_AR ]] && + ci_info "executable: \$CI_AR: $(command -V "$CI_AR")" + [[ $CI_RANLIB ]] && + ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")" + ci_info "## END OF CONFIGURATION ##" } function ci_build_cmake { + ci_info "## START OF BUILD ##" + ci_spawn "$(command -v "$CI_CMAKE")" --version + ci_spawn "$(command -v "$CI_CTEST")" --version # Initialize ALL_CC_FLAGS as a string. local ALL_CC_FLAGS="$CI_CC_FLAGS" [[ $CI_SANITIZERS ]] && ALL_CC_FLAGS="-fsanitize=$CI_SANITIZERS $ALL_CC_FLAGS" @@ -141,7 +157,7 @@ function ci_build_cmake { --config "$CI_CMAKE_BUILD_TYPE" \ --target clean \ "${ALL_CMAKE_BUILD_FLAGS[@]}" - ci_info "success!" + ci_info "## END OF BUILD ##" } ci_init_cmake diff --git a/ci/ci_legacy.sh b/ci/ci_legacy.sh index 830253f67..cfe1f53a3 100755 --- a/ci/ci_legacy.sh +++ b/ci/ci_legacy.sh @@ -55,29 +55,43 @@ function ci_init_legacy { } function ci_trace_legacy { + ci_info "## START OF CONFIGURATION ##" ci_info "system name: $CI_SYSTEM_NAME" ci_info "machine hardware name: $CI_MACHINE_NAME" ci_info "source directory: $CI_SRCDIR" ci_info "build directory: $CI_BUILDDIR" - ci_info "environment option: \$CI_LEGACY_MAKEFILES='$CI_LEGACY_MAKEFILES'" - ci_info "environment option: \$CI_MAKE='$CI_MAKE'" - ci_info "environment option: \$CI_MAKE_FLAGS='$CI_MAKE_FLAGS'" - ci_info "environment option: \$CI_MAKE_VARS='$CI_MAKE_VARS'" - ci_info "environment option: \$CI_CC='$CI_CC'" - ci_info "environment option: \$CI_CC_FLAGS='$CI_CC_FLAGS'" - ci_info "environment option: \$CI_CPP='$CI_CPP'" - ci_info "environment option: \$CI_CPP_FLAGS='$CI_CPP_FLAGS'" - ci_info "environment option: \$CI_AR='$CI_AR'" - ci_info "environment option: \$CI_RANLIB='$CI_RANLIB'" - ci_info "environment option: \$CI_LD='$CI_LD'" - ci_info "environment option: \$CI_LD_FLAGS='$CI_LD_FLAGS'" - ci_info "environment option: \$CI_LIBS='$CI_LIBS'" - ci_info "environment option: \$CI_SANITIZERS='$CI_SANITIZERS'" - ci_info "environment option: \$CI_NO_TEST='$CI_NO_TEST'" - ci_info "environment option: \$CI_NO_CLEAN='$CI_NO_CLEAN'" + ci_info "environment option: \$CI_LEGACY_MAKEFILES: '$CI_LEGACY_MAKEFILES'" + ci_info "environment option: \$CI_MAKE: '$CI_MAKE'" + ci_info "environment option: \$CI_MAKE_FLAGS: '$CI_MAKE_FLAGS'" + ci_info "environment option: \$CI_MAKE_VARS: '$CI_MAKE_VARS'" + ci_info "environment option: \$CI_CC: '$CI_CC'" + ci_info "environment option: \$CI_CC_FLAGS: '$CI_CC_FLAGS'" + ci_info "environment option: \$CI_CPP: '$CI_CPP'" + ci_info "environment option: \$CI_CPP_FLAGS: '$CI_CPP_FLAGS'" + ci_info "environment option: \$CI_AR: '$CI_AR'" + ci_info "environment option: \$CI_RANLIB: '$CI_RANLIB'" + ci_info "environment option: \$CI_LD: '$CI_LD'" + ci_info "environment option: \$CI_LD_FLAGS: '$CI_LD_FLAGS'" + ci_info "environment option: \$CI_LIBS: '$CI_LIBS'" + ci_info "environment option: \$CI_SANITIZERS: '$CI_SANITIZERS'" + ci_info "environment option: \$CI_NO_TEST: '$CI_NO_TEST'" + ci_info "environment option: \$CI_NO_CLEAN: '$CI_NO_CLEAN'" + ci_info "executable: \$CI_MAKE: $(command -V "$CI_MAKE")" + [[ $CI_CC ]] && + ci_info "executable: \$CI_CC: $(command -V "$CI_CC")" + [[ $CI_CPP ]] && + ci_info "executable: \$CI_CPP: $(command -V "$CI_CPP")" + [[ $CI_AR ]] && + ci_info "executable: \$CI_AR: $(command -V "$CI_AR")" + [[ $CI_RANLIB ]] && + ci_info "executable: \$CI_RANLIB: $(command -V "$CI_RANLIB")" + [[ $CI_LD ]] && + ci_info "executable: \$CI_LD: $(command -V "$CI_LD")" + ci_info "## END OF CONFIGURATION ##" } function ci_build_legacy { + ci_info "## START OF BUILD ##" # Initialize ALL_CC_FLAGS and ALL_LD_FLAGS as strings. local ALL_CC_FLAGS="$CI_CC_FLAGS" local ALL_LD_FLAGS="$CI_LD_FLAGS" @@ -121,7 +135,7 @@ function ci_build_legacy { "${ALL_MAKE_VARS[@]}" \ clean done - ci_info "success!" + ci_info "## END OF BUILD ##" } ci_init_legacy -- cgit v1.2.1