Skip to content

Commit

Permalink
[test-release.sh] Set TEST_SUITE_HOST_CC to the release testing build…
Browse files Browse the repository at this point in the history
… compiler when compiling test-suite tools.

The tools used by test-suite are originally configured to compile with cc by
default, and this is dictated by TEST_SUITE_HOST_CC.
However, it is possible that on some systems that the version of cc may either
not be present or it may not be able to compile the tools as it may be too old,
which could be an issue seen during release testing.

This patch updates the compiler to be the default build compiler that is used
for release testing. If no such compiler it specified, then cc will be set as
the test-suite tools build compiler by default (as it already is set under
TEST_SUITE_HOST_CC).

Differential Revision: https://reviews.llvm.org/D118357

(cherry picked from commit 413b35c)
  • Loading branch information
amy-kwan authored and tstellar committed Feb 14, 2022
1 parent 200390c commit b9f51fa
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion llvm/utils/release/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,8 @@ function test_llvmCore() {
if [ $do_test_suite = 'yes' ]; then
cd $TestSuiteBuildDir
env CC="$c_compiler" CXX="$cxx_compiler" \
cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit
cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \
-DTEST_SUITE_HOST_CC=$build_compiler

if ! ( ${MAKE} -j $NumJobs $KeepGoing check \
2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
Expand Down Expand Up @@ -551,6 +552,8 @@ for Flavor in $Flavors ; do

c_compiler="$CC"
cxx_compiler="$CXX"
build_compiler="$CC"
[[ -z "$build_compiler" ]] && build_compiler="cc"
llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj
llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install

Expand Down

0 comments on commit b9f51fa

Please sign in to comment.