[njs] Skipping expect tests if libedit is not available.
Dmitry Volyntsev
xeioex at nginx.com
Thu Oct 5 12:51:02 UTC 2017
details: http://hg.nginx.org/njs/rev/6789d9142b05
branches:
changeset: 413:6789d9142b05
user: Dmitry Volyntsev <xeioex at nginx.com>
date: Thu Oct 05 15:50:17 2017 +0300
description:
Skipping expect tests if libedit is not available.
diffstat:
nxt/auto/editline | 2 ++
nxt/auto/expect | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diffs (43 lines):
diff -r d0e24fa20991 -r 6789d9142b05 nxt/auto/editline
--- 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 @@ 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 -r d0e24fa20991 -r 6789d9142b05 nxt/auto/expect
--- 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 @@ 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
END
else
- $nxt_echo " not found"
$nxt_echo " - expect tests are disabled"
cat << END >> $NXT_MAKEFILE_CONF
More information about the nginx-devel
mailing list