From a2ab58da1a6f0b6c51537d92c40208c2e00b97e9 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Wed, 28 Nov 2018 04:50:04 +0100
Subject: [PATCH 1/2] travis: make sure that *.perf and directives.* files are
 in sync

New features are constantly added to networkd. Apparently, not everybody
knows that the "directives" files should be updated too to make
the fuzzers aware of them.
---
 tools/check-directives.sh    | 21 +++++++++++++++++++++
 travis-ci/managers/fedora.sh |  1 +
 2 files changed, 22 insertions(+)
 create mode 100755 tools/check-directives.sh

diff --git a/tools/check-directives.sh b/tools/check-directives.sh
new file mode 100755
index 0000000000..e2fd38898f
--- /dev/null
+++ b/tools/check-directives.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+function generate_directives() {
+    perl -aF'/[\s,]+/' -ne '
+        if (my ($s, $d) = ($F[0] =~ /^([^\s\.]+)\.([^\s\.]+)$/)) { $d{$s}{"$d="} = 1; }
+        END { while (my ($key, $value) = each %d) {
+            printf "[%s]\n%s\n", $key, join("\n", keys(%$value))
+        }}' "$1"
+}
+
+if [[ $(generate_directives src/network/networkd-network-gperf.gperf | wc -l) -ne $(wc -l <test/fuzz/fuzz-network-parser/directives.network) ]]; then
+	echo "Looks like test/fuzz/fuzz-network-parser/directives.network hasn't been updated"
+	exit 1
+fi
+
+if [[ $(generate_directives src/network/netdev/netdev-gperf.gperf | wc -l) -ne $(wc -l <test/fuzz/fuzz-netdev-parser/directives.netdev) ]]; then
+	echo "Looks like test/fuzz/fuzz-netdev-parser/directives.netdev hasn't been updated"
+	exit 1
+fi
diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh
index c84d10bbe6..b3ee0281a6 100755
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@ -50,6 +50,7 @@ for phase in "${PHASES[@]}"; do
             $DOCKER_EXEC meson --werror -Dtests=unsafe -Dslow-tests=true build
             $DOCKER_EXEC ninja -v -C build
             $DOCKER_EXEC ninja -C build test
+            $DOCKER_EXEC tools/check-directives.sh
             ;;
         RUN_ASAN)
             $DOCKER_EXEC git clean -dxff

From 5260482d4c9d12d9dd69ddc645509248720f675c Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Wed, 28 Nov 2018 05:13:17 +0100
Subject: [PATCH 2/2] tests: update
 test/fuzz/fuzz-netdev-parser/directives.netdev

This is a follow-up to 2266864b04257d7a.
---
 test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev | 11 +++++++++++
 test/fuzz/fuzz-netdev-parser/directives.netdev       |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev

diff --git a/test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev b/test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev
new file mode 100644
index 0000000000..0fd8b92b2f
--- /dev/null
+++ b/test/fuzz/fuzz-netdev-parser/25-erspan-tunnel.netdev
@@ -0,0 +1,11 @@
+[NetDev]
+Name=erspan-test
+Kind=erspan
+
+[Tunnel]
+Independent=true
+ERSPANIndex=123
+Local=172.16.1.200
+Remote=172.16.1.100
+Key=101
+SerializeTunneledPackets=true
diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev
index 88d2788191..19226df806 100644
--- a/test/fuzz/fuzz-netdev-parser/directives.netdev
+++ b/test/fuzz/fuzz-netdev-parser/directives.netdev
@@ -74,6 +74,8 @@ EncapsulationLimit=
 TTL=
 FOUSourcePort=
 IPv6RapidDeploymentPrefix=
+ERSPANIndex=
+SerializeTunneledPackets=
 [VXLAN]
 UDP6ZeroChecksumRx=
 ARPProxy=