Use sorted chksum_diag for diagnostic regression

This patch uses the new timestamped chksum_diag output for sorting, so
that diagnostics can be verified as order-independent.

Sorting is achieved by copying the appending timestamp as a prepended
timestamp, and then passed to sort.

This is still a jury rigged solution, but it prevents false regressions
from a reordered diagnostic.

Author: marshallward

.testing/Makefile

@@ -503,14 +503,10 @@ $(foreach c,$(CONFIGS),$(eval $(call CONFIG_DIM_RULE,$(c))))
 # Regression testing only checks for changes in existing diagnostics
 .PRECIOUS: $(WORK)/%/target/chksum_diag
 %.regression.diag: $(foreach b,symmetric target,$(WORK)/%/$(b)/chksum_diag)
-	@! diff $^ | grep "^[<>]" | grep "^>" > /dev/null \
-	  || ! (\
-	    mkdir -p $(WORK)/results/$*; \
-	    (diff $^ | tee $(WORK)/results/$*/chksum_diag.regression.diff | head -n 20) ; \
+	@tools/diff_diag.sh $^ || ! (\
 	    echo -e "$(FAIL): Diagnostics $*.regression.diag have changed." \
 	  )
-	@cmp $^ || ( \
-	  diff $^ | head -n 20; \
+	@tools/cmp_diag.sh $^ || ( \
 	  echo -e "$(WARN): New diagnostics in $<" \
 	)
 	@echo -e "$(PASS): Diagnostics $*.regression.diag agree."

.testing/tools/cmp_diag.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for chk in $1 $2; do
+    awk '{print $(NF-2) " " $(NF-1) " " $(NF),$0}' ${chk} | sort > ${chk}.sorted
+done
+
+cmp $1.sorted $2.sorted
+
+if [ $? -eq 1 ]; then
+    diff $1.sorted $2.sorted | head -n 100
+    exit 1
+fi

.testing/tools/diff_diag.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+for chk in $1 $2; do
+    awk '{print $(NF-2) " " $(NF-1) " " $(NF),$0}' ${chk} | sort > ${chk}.sorted
+done
+
+diff $1.sorted $2.sorted | grep "^[<>]" | grep "^>" > /dev/null
+
+if [ $? -eq 0 ]; then
+    diff $1.sorted $2.sorted | head -n 100
+    exit 1
+fi