From e46300a724d07353fa2ddb18f50b6b43ab296ffa Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Sat, 18 May 2013 16:47:04 -0700 Subject: [PATCH] Fixing test that would fail without ES/curl support. It used to special-case an error message produced in the case that ES isn't available, however with scripts/test-all-policy.bro now explicitly disabling ES output, that doesn't seem necessary anymore. --- .../coverage.bare-mode-errors/unique_errors_no_elasticsearch | 1 - testing/btest/coverage/bare-mode-errors.test | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 testing/btest/Baseline/coverage.bare-mode-errors/unique_errors_no_elasticsearch diff --git a/testing/btest/Baseline/coverage.bare-mode-errors/unique_errors_no_elasticsearch b/testing/btest/Baseline/coverage.bare-mode-errors/unique_errors_no_elasticsearch deleted file mode 100644 index e95f88e74b..0000000000 --- a/testing/btest/Baseline/coverage.bare-mode-errors/unique_errors_no_elasticsearch +++ /dev/null @@ -1 +0,0 @@ -error: unknown writer type requested diff --git a/testing/btest/coverage/bare-mode-errors.test b/testing/btest/coverage/bare-mode-errors.test index da968d5601..34ba063081 100644 --- a/testing/btest/coverage/bare-mode-errors.test +++ b/testing/btest/coverage/bare-mode-errors.test @@ -11,5 +11,4 @@ # @TEST-EXEC: test -d $DIST/scripts # @TEST-EXEC: for script in `find $DIST/scripts/ -name \*\.bro -not -path '*/site/*'`; do echo "=== $script" >>allerrors; if echo "$script" | egrep -q 'communication/listen|controllee'; then rm -rf load_attempt .bgprocs; btest-bg-run load_attempt bro -b $script; btest-bg-wait -k 2; cat load_attempt/.stderr >>allerrors; else bro -b $script 2>>allerrors; fi done || exit 0 # @TEST-EXEC: cat allerrors | grep -v "received termination signal" | grep -v '===' | sort | uniq > unique_errors -# @TEST-EXEC: if [ $(grep -c LibCURL_INCLUDE_DIR-NOTFOUND $BUILD/CMakeCache.txt) -ne 0 ]; then cp unique_errors unique_errors_no_elasticsearch; fi -# @TEST-EXEC: if [ $(grep -c LibCURL_INCLUDE_DIR-NOTFOUND $BUILD/CMakeCache.txt) -ne 0 ]; then btest-diff unique_errors_no_elasticsearch; else btest-diff unique_errors; fi +# @TEST-EXEC: btest-diff unique_errors