From 1d23f055bab092978729f3637fdd3997c25d4bba Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Mon, 14 Oct 2013 15:05:06 -0500 Subject: [PATCH] Add check for sqlite3 command to tests that require it --- testing/btest/scripts/base/frameworks/input/sqlite/basic.bro | 2 ++ testing/btest/scripts/base/frameworks/input/sqlite/error.bro | 2 ++ testing/btest/scripts/base/frameworks/input/sqlite/port.bro | 2 ++ testing/btest/scripts/base/frameworks/input/sqlite/types.bro | 2 ++ testing/btest/scripts/base/frameworks/logging/sqlite/error.bro | 1 + testing/btest/scripts/base/frameworks/logging/sqlite/types.bro | 1 + .../btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro | 1 + 7 files changed, 11 insertions(+) diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro b/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro index 03bc91beb7..aa3a75ae4b 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/basic.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro b/testing/btest/scripts/base/frameworks/input/sqlite/error.bro index 53ac1e0863..c6712df99a 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/error.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro b/testing/btest/scripts/base/frameworks/input/sqlite/port.bro index 049ad2a386..c2949b5b3e 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/port.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro b/testing/btest/scripts/base/frameworks/input/sqlite/types.bro index 4e60de3a96..ddcbefa67f 100644 --- a/testing/btest/scripts/base/frameworks/input/sqlite/types.bro +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro index 27193250a4..2e5d22f188 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/error.bro +++ b/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 # diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro index a6a1c04b02..7c896a7192 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/types.bro +++ b/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 # diff --git a/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro b/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro index 0e40c60008..b48520440a 100644 --- a/testing/btest/scripts/base/frameworks/logging/sqlite/wikipedia.bro +++ b/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 #