Mercurial > hg > nginx

changeset 6498:82a76258a142

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 01 Apr 2016 16:38:28 +0300
parents 9d66d7ed2abb
children e20bf454e58b
files auto/types/sizeof auto/types/typedef
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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*
+
--- 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
 
-    else
+    rm -rf $NGX_AUTOTEST*
+
+    if [ $ngx_found != no ]; then
         break
     fi
 done