From 9b434b79ce74dab0498fc0ee1df5df3b2441cfad Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 26 Mar 2020 12:37:49 -0400
Subject: [PATCH] Add a test script to check subsystem order as part of make
 check.

---
 scripts/maint/run_check_subsystem_order.sh | 17 +++++++++++++++++
 src/test/include.am                        |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100755 scripts/maint/run_check_subsystem_order.sh

diff --git a/scripts/maint/run_check_subsystem_order.sh b/scripts/maint/run_check_subsystem_order.sh
new file mode 100755
index 0000000000..1e68b9d008
--- /dev/null
+++ b/scripts/maint/run_check_subsystem_order.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+TOR="${abs_top_builddir:-.}/src/app/tor"
+
+INCLUDES_PY="${abs_top_srcdir:-.}/scripts/maint/practracker/includes.py"
+
+if ! test -x "${INCLUDES_PY}" ; then
+    echo "skip"
+    exit 77
+fi
+
+"${TOR}" --dbg-dump-subsystem-list | \
+    "${INCLUDES_PY}" --check-subsystem-order -
+
+echo ok
diff --git a/src/test/include.am b/src/test/include.am
index de927836d6..e7647260c5 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -37,7 +37,8 @@ TESTSCRIPTS += \
 	src/test/test_ntor.sh \
 	src/test/test_hs_ntor.sh \
 	src/test/test_bt.sh \
-	scripts/maint/practracker/test_practracker.sh
+	scripts/maint/practracker/test_practracker.sh \
+	scripts/maint/run_check_subsystem_order.sh
 
 if COVERAGE_ENABLED
 # ...
@@ -430,6 +431,7 @@ EXTRA_DIST += \
 	src/test/test_rebind.sh \
 	src/test/test_rebind.py \
 	src/test/zero_length_keys.sh \
+	scripts/maint/run_check_subsystem_order.sh \
 	src/test/rust_supp.txt \
 	src/test/test_keygen.sh \
 	src/test/test_key_expiration.sh \