aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2014-06-18 10:24:23 -0700
committerEvan Huus <eapache@gmail.com>2014-06-18 18:32:18 +0000
commitfca7b3f4f88652857dc9e416b95cf1bc260a8444 (patch)
tree4a2aede13c43c9da863e1edca7f94b1477db7b75 /test
parent77e34736c5176f8d349f0b3b2c308a1604714c4a (diff)
Check for lua by grepping the output of tshark -v
Grepping config.h doesn't work for out-of-tree builds. Change-Id: If3f551dffb04dd646f5adece57fac90dc48ff1c9 Reviewed-on: https://code.wireshark.org/review/2389 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/config.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/config.sh b/test/config.sh
index 7cd39886d6..526f796053 100755
--- a/test/config.sh
+++ b/test/config.sh
@@ -98,8 +98,8 @@ export WIRESHARK_QUIT_AFTER_CAPTURE="True"
CAPTURE_DIR="$TESTS_DIR/captures/"
# Figure out if we were built with lua or not so we can skip the lua tests if we
-# don't have it. Is there a better way to do this than grepping config.h?
-grep -q "#define HAVE_LUA 1" $SOURCE_DIR/config.h
+# don't have it.
+$TSHARK -v | grep -q "with Lua"
HAVE_LUA=$?
# Display our environment