[nginx] Configure: fixed autotest source code logging.

Maxim Dounin mdounin at mdounin.ru
Fri Apr 1 13:45:00 UTC 2016


details:   http://hg.nginx.org/nginx/rev/82a76258a142
branches:  
changeset: 6498:82a76258a142
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Fri Apr 01 16:38:28 2016 +0300
description:
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:

 auto/types/sizeof  |  8 +++++---
 auto/types/typedef |  7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (50 lines):

diff --git a/auto/types/sizeof b/auto/types/sizeof
--- 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
--- 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



More information about the nginx-devel mailing list