From f3fb2b2f527de34b2b888122f6a24af126e4edd4 Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Sat, 15 Aug 2015 21:05:40 -0500 Subject: [PATCH] Fix diff-canonifier-external to use basename of input file Use basename of the input filename because sometimes it will have directory components, such as for the baseline files. --- testing/scripts/diff-canonifier-external | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/scripts/diff-canonifier-external b/testing/scripts/diff-canonifier-external index aabe9218e6..ee6405b3a8 100755 --- a/testing/scripts/diff-canonifier-external +++ b/testing/scripts/diff-canonifier-external @@ -2,13 +2,15 @@ # # Default canonifier used with the trace-based tests in testing/external/*. +filename=`basename $1` + addl="cat" -if [ "$1" == "capture_loss.log" ]; then +if [ "$filename" == "capture_loss.log" ]; then addl="`dirname $0`/diff-remove-fractions" fi -if [ "$1" == "ssh.log" ]; then +if [ "$filename" == "ssh.log" ]; then addl="`dirname $0`/diff-remove-fields remote_location" fi