From 082c67616511c7c08627eaf19af7e59a7f360479 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Thu, 9 Dec 2021 22:16:19 +0000
Subject: [PATCH] meson: exclude .gitattributes when using install_subdir

It picks the whole content of the directory by default, but we don't
want to install .gitattributes files. Add it to all invocations, not
just the ones on subdirs with .gitattributes, so that we don't regress
in the future.

Fixes #21715

Conflict:Adaptation Context.
Reference:https://github.com/systemd/systemd/commit/082c67616511c7c08627eaf19af7e59a7f360479

---
 test/meson.build | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/test/meson.build b/test/meson.build
index 6f8f257..8727e66 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -4,36 +4,52 @@ if install_tests
         testdata_dir = testsdir + '/testdata/'
 
         install_subdir('journal-data',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('test-execute',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('test-path',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('test-path-util',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('test-umount',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('test-network-generator-conversion',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-04.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-06.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-10.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-11.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-16.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-28.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-30.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-52.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
         install_subdir('testsuite-63.units',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
 
         testsuite08_dir = testdata_dir + '/testsuite-08.units'
@@ -50,6 +66,7 @@ if install_tests
 
         if conf.get('ENABLE_RESOLVE') == 1
                 install_subdir('test-resolve',
+                               exclude_files : '.gitattributes',
                                install_dir : testdata_dir)
         endif
 
@@ -72,6 +89,7 @@ if install_tests and conf.get('ENABLE_SYSUSERS') == 1
         install_data(test_sysusers_sh,
                      install_dir : testsdir)
         install_subdir('test-sysusers',
+                       exclude_files : '.gitattributes',
                        install_dir : testdata_dir)
 endif
 
-- 
2.33.0

