From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 5 Oct 2017 12:50:17 +0000 (+0300)
Subject: Skipping expect tests if libedit is not available.
X-Git-Tag: 0.1.14~4
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=200bcb9d5df1b553d2727b3d018c1dffe79940da;p=njs.git

Skipping expect tests if libedit is not available.
---

diff --git a/nxt/auto/editline b/nxt/auto/editline
index 101693a6..68ad9da7 100644
--- a/nxt/auto/editline
+++ b/nxt/auto/editline
@@ -28,6 +28,7 @@ if [ $nxt_found = no ]; then
 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 @@ default:	njs
 END
 
 else
+    NXT_HAVE_LIBEDIT=NO
     $nxt_echo " - building interactive shell is not possible"
 
     cat << END >> $NXT_MAKEFILE_CONF
diff --git a/nxt/auto/expect b/nxt/auto/expect
index b924bbd5..12652cd9 100644
--- a/nxt/auto/expect
+++ b/nxt/auto/expect
@@ -12,6 +12,12 @@ fi
 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 @@ njs_expect_test:	njs njs/test/njs_expect_test.exp
 END
 
 else
-    $nxt_echo " not found"
     $nxt_echo " - expect tests are disabled"
 
     cat << END >> $NXT_MAKEFILE_CONF