From f970705aa8a7107e25ab8ae65b7984170e3ea91e Mon Sep 17 00:00:00 2001
From: Grant Erickson <gerickson@google.com>
Date: Tue, 31 Mar 2020 10:22:07 -0700
Subject: [PATCH] Ensure content under tests is tracked for the project
 distribution.

---
 Makefile.am       |  3 ++-
 configure.ac      |  3 ++-
 tests/Makefile.am | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 tests/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e83f335a5598cd..38d873f228e5b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #
-#    <COPYRIGHT>
+#    Copyright (c) 2020 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@ AM_MAKEFLAGS                             = --no-print-directory
 SUBDIRS                                  = \
     third_party                            \
     src                                    \
+    tests                                  \
     $(NULL)
 
 PRETTY_SUBDIRS                           = \
diff --git a/configure.ac b/configure.ac
index ac32a04349e12e..33c4caef0848a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 #
-#    <COPYRIGHT>
+#    Copyright (c) 2020 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -1810,6 +1810,7 @@ src/setup_payload/tests/Makefile
 src/inet/Makefile
 src/lib/Makefile
 src/platform/Makefile
+tests/Makefile
 ])
 
 #
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 00000000000000..5f7bff3b4a8c97
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,42 @@
+#
+#    Copyright (c) 2020 Project CHIP Authors
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+#
+#    Description:
+#      This file is the GNU automake template for the Project CHIP
+#      tests directory.
+#
+
+include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
+
+EXTRA_DIST                                   = \
+    integration/README.md                      \
+    docs/README.md                             \
+    fuzz/README.md                             \
+    certification/README.md                    \
+    $(NULL)
+
+# Always package (e.g. for 'make dist') these subdirectories.
+
+DIST_SUBDIRS                                 = \
+    $(NULL)
+
+# Always build (e.g. for 'make all') these subdirectories.
+
+SUBDIRS                                      = \
+    $(NULL)
+
+include $(abs_top_nlbuild_autotools_dir)/automake/post.am