From bfeca444dbe6d7355465834f7b1024227b14cd6d Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 29 Feb 2012 17:09:38 -0800 Subject: [PATCH] Sorting all output for the external tests. Let's see how this goes. The script keeps comments at the beginning. --- testing/scripts/diff-canonifier-external | 1 + testing/scripts/diff-sort | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100755 testing/scripts/diff-sort diff --git a/testing/scripts/diff-canonifier-external b/testing/scripts/diff-canonifier-external index 1f953183d3..6796614362 100755 --- a/testing/scripts/diff-canonifier-external +++ b/testing/scripts/diff-canonifier-external @@ -6,3 +6,4 @@ | `dirname $0`/diff-remove-uids \ | `dirname $0`/diff-remove-mime-types \ | `dirname $0`/diff-remove-x509-names \ + | `dirname $0`/diff-sort diff --git a/testing/scripts/diff-sort b/testing/scripts/diff-sort new file mode 100755 index 0000000000..08b36c79bf --- /dev/null +++ b/testing/scripts/diff-sort @@ -0,0 +1,19 @@ +#! /usr/bin/env bash +# +# A diff canonifier that sorts all lines but keeps all comments +# at the top. It also adds a note at the beginning as a reminder +# that the output has been sorted. + +if [ "$TMP" == "" ]; then + TMP=/tmp +fi + +tmp=$TMP/`basename $0`.$$.tmp + +cat >$tmp + +echo "### NOTE: This file has been sorted with `basename $0`." +cat $tmp | grep ^# +cat $tmp | grep -v ^# | sort -s + +rm -f $tmp