1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"frame" execution of config tests precisely

Browse Source 
the purpose is to make build log parsers able to ignore build failures
in verbose configure output.

Change-Id: I01af2e019fd1b055fdfcf6749faeebacb7a39c3f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2015-09-28 20:19:36 +02:00
parent 4b785eeaa9
commit e8dcd5038d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -3339,6 +3339,8 @@ fi
# tests that don't need qmake (must be run before displaying help) # tests that don't need qmake (must be run before displaying help)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
echo "Running configuration tests (phase 1)..."
# detect build style # detect build style
if [ "$CFG_DEBUG" = "auto" ]; then if [ "$CFG_DEBUG" = "auto" ]; then
if [ "$XPLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then if [ "$XPLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
@ -3611,6 +3613,8 @@ unset tty
eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`"
unset tty unset tty
echo "Done running configuration tests."
#setup the build parts #setup the build parts
if [ -z "$CFG_BUILD_PARTS" ]; then if [ -z "$CFG_BUILD_PARTS" ]; then
CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS" CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
@ -4112,7 +4116,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
fi fi
fi # Build qmake fi # Build qmake
echo "Running configuration tests..." echo "Running configuration tests (phase 2)..."
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# create a qt.conf for the Qt build tree itself # create a qt.conf for the Qt build tree itself
@ -6641,6 +6645,8 @@ s/icpc version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\) .*$/QT_ICC_MAJOR_VERSION=\1; Q
;; ;;
esac esac
echo "Done running configuration tests."
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# part of configuration information goes into qconfig.h # part of configuration information goes into qconfig.h
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------

2
tools/configure/configureapp.cpp
View File

@ -2577,6 +2577,8 @@ void Configure::autoDetection()
dictionary["QT_POINTER_SIZE"] = "8"; dictionary["QT_POINTER_SIZE"] = "8";
else else
dictionary["QT_POINTER_SIZE"] = "4"; dictionary["QT_POINTER_SIZE"] = "4";
cout << "Done running configuration tests." << endl;
} }
bool Configure::verifyConfiguration() bool Configure::verifyConfiguration()