diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-04-01 16:38:28 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-04-01 16:38:28 +0300 |
| commit | 622d152b9f936ddc15deac05b3e5b5f60a9d13bb (patch) | |
| tree | 98c75ab8e01997ef28752c9a9750f16646483540 | |
| parent | 74ee55ec1b49266865646d488026f3e6802e1b85 (diff) | |
| download | nginx-622d152b9f936ddc15deac05b3e5b5f60a9d13bb.tar.gz nginx-622d152b9f936ddc15deac05b3e5b5f60a9d13bb.tar.bz2 | |
Configure: fixed autotest source code logging.
Fixed a regression introduced in rev. 434548349838 that prevented
auto/types/sizeof and auto/types/typedef properly reporting autotest
source code to autoconf.err in case of test failure.
Diffstat (limited to '')
| -rw-r--r-- | auto/types/sizeof | 8 | ||||
| -rw-r--r-- | auto/types/typedef | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/auto/types/sizeof b/auto/types/sizeof index a5f66bbd9..b5b71bb98 100644 --- a/auto/types/sizeof +++ b/auto/types/sizeof @@ -45,9 +45,6 @@ if [ -x $NGX_AUTOTEST ]; then fi -rm -rf $NGX_AUTOTEST* - - case $ngx_size in 4) ngx_max_value=2147483647 @@ -69,6 +66,11 @@ case $ngx_size in echo $ngx_test >> $NGX_AUTOCONF_ERR echo "----------" >> $NGX_AUTOCONF_ERR + rm -rf $NGX_AUTOTEST* + exit 1 esac + +rm -rf $NGX_AUTOTEST* + diff --git a/auto/types/typedef b/auto/types/typedef index 8b5c3689c..f167e80d9 100644 --- a/auto/types/typedef +++ b/auto/types/typedef @@ -49,8 +49,6 @@ END fi fi - rm -rf $NGX_AUTOTEST* - if [ $ngx_found = no ]; then echo $ngx_n " $ngx_try not found$ngx_c" @@ -59,8 +57,11 @@ END echo "----------" >> $NGX_AUTOCONF_ERR echo $ngx_test >> $NGX_AUTOCONF_ERR echo "----------" >> $NGX_AUTOCONF_ERR + fi + + rm -rf $NGX_AUTOTEST* - else + if [ $ngx_found != no ]; then break fi done |