changeset 413:6789d9142b05

Skipping expect tests if libedit is not available.
author Dmitry Volyntsev <xeioex@nginx.com>
date Thu, 05 Oct 2017 15:50:17 +0300
parents d0e24fa20991
children b4462c7dc1b1
files nxt/auto/editline nxt/auto/expect
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/nxt/auto/editline	Thu Oct 05 15:50:16 2017 +0300
+++ b/nxt/auto/editline	Thu Oct 05 15:50:17 2017 +0300
@@ -28,6 +28,7 @@
 fi
 
 if [ $nxt_found = yes ]; then
+    NXT_HAVE_LIBEDIT=YES
     cat << END >> $NXT_MAKEFILE_CONF
 
 NXT_EDITLINE_CFLAGS = $nxt_feature_incs
@@ -37,6 +38,7 @@
 END
 
 else
+    NXT_HAVE_LIBEDIT=NO
     $nxt_echo " - building interactive shell is not possible"
 
     cat << END >> $NXT_MAKEFILE_CONF
--- a/nxt/auto/expect	Thu Oct 05 15:50:16 2017 +0300
+++ b/nxt/auto/expect	Thu Oct 05 15:50:17 2017 +0300
@@ -12,6 +12,12 @@
 if [ $nxt_found = yes ]; then
     $nxt_echo " found"
     $nxt_echo " + Expect version: `expect -v`"
+
+else
+    $nxt_echo " not found"
+fi
+
+if [ $nxt_found = yes -a $NXT_HAVE_LIBEDIT = YES ]; then
     cat << END >> $NXT_MAKEFILE_CONF
 
 njs_expect_test:	njs njs/test/njs_expect_test.exp
@@ -19,7 +25,6 @@
 END
 
 else
-    $nxt_echo " not found"
     $nxt_echo " - expect tests are disabled"
 
     cat << END >> $NXT_MAKEFILE_CONF