Merge remote-tracking branch 'origin/master' into topic/dnthayer/doc-changes-for-2.2

testing/btest/scripts/base/frameworks/input/sqlite/basic.bro

@@ -1,6 +1,8 @@
 #
 # @TEST-GROUP: sqlite
 #
+# @TEST-REQUIRES: which sqlite3
+#
 # @TEST-EXEC: cat conn.sql | sqlite3 conn.sqlite
 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
 # @TEST-EXEC: btest-bg-wait 10

testing/btest/scripts/base/frameworks/input/sqlite/error.bro

@@ -1,3 +1,5 @@
+# @TEST-REQUIRES: which sqlite3
+#
 # @TEST-EXEC: cat ssh.sql | sqlite3 ssh.sqlite
 #
 # @TEST-GROUP: sqlite

testing/btest/scripts/base/frameworks/input/sqlite/port.bro

@@ -1,6 +1,8 @@
 #
 # @TEST-GROUP: sqlite
 #
+# @TEST-REQUIRES: which sqlite3
+#
 # @TEST-EXEC: cat port.sql | sqlite3 port.sqlite
 # @TEST-EXEC: btest-bg-run bro bro -b %INPUT
 # @TEST-EXEC: btest-bg-wait 10

testing/btest/scripts/base/frameworks/input/sqlite/types.bro

@@ -1,3 +1,5 @@
+# @TEST-REQUIRES: which sqlite3
+#
 # @TEST-EXEC: cat ssh.sql | sqlite3 ssh.sqlite
 #
 # @TEST-GROUP: sqlite

testing/btest/scripts/base/frameworks/logging/sqlite/error.bro

@@ -1,4 +1,5 @@
 #
+# @TEST-REQUIRES: which sqlite3
 # @TEST-REQUIRES: has-writer SQLite 
 # @TEST-GROUP: sqlite
 #

testing/btest/scripts/base/frameworks/logging/sqlite/types.bro

@@ -1,4 +1,5 @@
 #
+# @TEST-REQUIRES: which sqlite3
 # @TEST-REQUIRES: has-writer SQLite 
 # @TEST-GROUP: sqlite
 #

testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro

@@ -1,4 +1,5 @@
 #
+# @TEST-REQUIRES: which sqlite3
 # @TEST-REQUIRES: has-writer SQLite
 # @TEST-GROUP: sqlite
 #

testing/btest/scripts/base/utils/active-http.test

@@ -1,4 +1,5 @@
 # @TEST-REQUIRES: which python
+# @TEST-REQUIRES: which curl
 #
 # @TEST-EXEC: btest-bg-run httpd python $SCRIPTS/httpd.py --max 1
 # @TEST-EXEC: sleep 3