From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 7 May 2019 18:31:32 +0000 (+0200)
Subject: check-directives: use diff to show what the differences really are
X-Git-Tag: v243-rc1~471^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=291539b75e31754f245022ecf7e536b28955e602;p=thirdparty%2Fsystemd.git

check-directives: use diff to show what the differences really are

This also makes the comparison more detailed, since we check spelling,
including case.
---

diff --git a/tools/check-directives.sh b/tools/check-directives.sh
index e8c6e600407..46f770222f5 100755
--- a/tools/check-directives.sh
+++ b/tools/check-directives.sh
@@ -10,17 +10,23 @@ function generate_directives() {
 }
 
 ret=0
-if [[ $(generate_directives src/network/networkd-network-gperf.gperf | wc -l) -ne $(wc -l <test/fuzz/fuzz-network-parser/directives.network) ]]; then
+if ! diff \
+     <(generate_directives src/network/networkd-network-gperf.gperf | sort) \
+     <(cat test/fuzz/fuzz-network-parser/directives.network | sort); then
     echo "Looks like test/fuzz/fuzz-network-parser/directives.network hasn't been updated"
     ret=1
 fi
 
-if [[ $(generate_directives src/network/netdev/netdev-gperf.gperf | wc -l) -ne $(wc -l <test/fuzz/fuzz-netdev-parser/directives.netdev) ]]; then
+if ! diff \
+     <(generate_directives src/network/netdev/netdev-gperf.gperf | sort) \
+     <(cat test/fuzz/fuzz-netdev-parser/directives.netdev | sort); then
     echo "Looks like test/fuzz/fuzz-netdev-parser/directives.netdev hasn't been updated"
     ret=1
 fi
 
-if [[ $(generate_directives src/udev/net/link-config-gperf.gperf | wc -l) -ne $(wc -l <test/fuzz/fuzz-link-parser/directives.link) ]]; then
+if ! diff \
+     <(generate_directives src/udev/net/link-config-gperf.gperf | sort) \
+     <(cat test/fuzz/fuzz-link-parser/directives.link | sort) ; then
     echo "Looks like test/fuzz/fuzz-link-parser/directives.link hasn't been updated"
     ret=1
 fi