From 2acaacee2d34dc2149d61d9fdc8f2365b9551ff3 Mon Sep 17 00:00:00 2001
From: Vern Paxson <vern@corelight.com>
Date: Wed, 9 Jun 2021 15:29:39 -0700
Subject: [PATCH] whoops overlooked the need to canonicalize filenames

---
 testing/btest/Baseline/language.common-mistakes2/err | 2 +-
 testing/btest/language/common-mistakes2.zeek         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/btest/Baseline/language.common-mistakes2/err b/testing/btest/Baseline/language.common-mistakes2/err
index 337cbb1872..53363fbd9b 100644
--- a/testing/btest/Baseline/language.common-mistakes2/err
+++ b/testing/btest/Baseline/language.common-mistakes2/err
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in /Users/vern/warehouse/zeek-ZAM-prep3/testing/btest/.tmp/language.common-mistakes2/common-mistakes2.zeek, line 16: type-checking failed in vector append (v += ok)
+expression error in <...>/common-mistakes2.zeek, line 16: type-checking failed in vector append (v += ok)
diff --git a/testing/btest/language/common-mistakes2.zeek b/testing/btest/language/common-mistakes2.zeek
index 065617760e..20c1ae0f1f 100644
--- a/testing/btest/language/common-mistakes2.zeek
+++ b/testing/btest/language/common-mistakes2.zeek
@@ -6,8 +6,8 @@
 # @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
 
 # @TEST-EXEC: zeek -b %INPUT >out 2>err
-# @TEST-EXEC: btest-diff out
-# @TEST-EXEC: btest-diff err
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 function foo(v: vector of any)
 	{