Merge remote branch 'origin/master' into topic/policy-scripts-new

testing/btest/bifs/unique_id-rnd.bro

@@ -1,7 +1,7 @@
 #
 # @TEST-EXEC: BRO_SEED_FILE= bro %INPUT 2>/dev/null >out
 # @TEST-EXEC: BRO_SEED_FILE= bro %INPUT 2>/dev/null >>out
-# @TEST-EXEC: cat out | sort | uniq | wc -l >count
+# @TEST-EXEC: cat out | sort | uniq | wc -l | sed 's/ //g' >count
 # @TEST-EXEC: btest-diff count
 
 print unique_id("A-");

testing/btest/core/conn-id.bro

@@ -7,7 +7,7 @@
 # Without a seed, they should differ each time:
 #
 # @TEST-EXEC: unset BRO_SEED_FILE &&  bro -C -r $TRACES/wikipedia.trace %INPUT tcp >output2
-# @TEST-EXEC: cat output output2 | sort | uniq -c | wc -l >counts
+# @TEST-EXEC: cat output output2 | sort | uniq -c | wc -l | sed 's/ //g' >counts
 # @TEST-EXEC: btest-diff counts
 #
 # Make sure it works without the connection compressor as well.

testing/btest/core/load-pkg.bro

@@ -2,6 +2,6 @@
 # @TEST-EXEC: echo "@load foo/test.bro" >foo/__load__.bro
 # @TEST-EXEC: cp %INPUT foo/test.bro
 # @TEST-EXEC: bro -l foo >output 2>&1
-# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
 
 print "Foo loaded";

testing/btest/language/wrong-delete-field.bro

@@ -1,5 +1,5 @@
 # @TEST-EXEC-FAIL: bro %INPUT  >output 2>&1
-# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
 
 type X: record {
      a: count;