From 075edbdd2bc6500efc50b321f25a2d6b8787adc1 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Wed, 9 May 2018 14:30:22 -0500 Subject: [PATCH] Sort output of the missing-file-initially.bro test The output needs to be sorted to ensure that the test doesn't fail. --- .../bro..stdout | 10 +++++----- .../base/frameworks/input/missing-file-initially.bro | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.missing-file-initially/bro..stdout b/testing/btest/Baseline/scripts.base.frameworks.input.missing-file-initially/bro..stdout index 3d47249011..4178deba14 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.missing-file-initially/bro..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.input.missing-file-initially/bro..stdout @@ -1,5 +1,5 @@ -input: now it does -input: and more! -inputstream: now it does -inputstream: and more! -inputstream: Streaming still works +input: 1 now it does +input: 2 and more! +inputstream: 1 now it does +inputstream: 2 and more! +inputstream: 3 streaming still works diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro b/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro index 5b7baed4f9..1de9fbd539 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro +++ b/testing/btest/scripts/base/frameworks/input/missing-file-initially.bro @@ -8,17 +8,17 @@ # @TEST-EXEC: mv does-exist.dat does-not-exist.dat # @TEST-EXEC: sleep 2 # @TEST-EXEC: mv does-not-exist.dat does-not-exist-again.dat -# @TEST-EXEC: echo "Streaming still works" >> does-not-exist-again.dat +# @TEST-EXEC: echo "3 streaming still works" >> does-not-exist-again.dat # @TEST-EXEC: btest-bg-wait -k 3 -# @TEST-EXEC: btest-diff bro/.stdout +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff bro/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff bro/.stderr @TEST-START-FILE does-exist.dat #separator \x09 #fields line #types string -now it does -and more! +1 now it does +2 and more! @TEST-END-FILE redef exit_only_after_terminate = T;