From a87b51f75cd81d89214c3ba6d36a3645b641b5aa Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Thu, 14 Mar 2019 16:56:52 +0000
Subject: [PATCH] Add test case for multiple cross files

---
 run_unittests.py                              | 19 +++++++++++++++++++
 .../unit/57 native file override/crossfile2   |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 test cases/unit/57 native file override/crossfile2

diff --git a/run_unittests.py b/run_unittests.py
index 24dda8b31..44129dcb7 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5871,6 +5871,25 @@ class CrossFileTests(BasePlatformTests):
                               '-Ddef_sharedstatedir=sharedstatebar',
                               '-Ddef_sysconfdir=sysconfbar'])
 
+    def test_cross_file_dirs_chain(self):
+        # crossfile2 overrides crossfile overrides nativefile
+        testcase = os.path.join(self.unit_test_dir, '57 native file override')
+        self.init(testcase, default_args=False,
+                  extra_args=['--native-file', os.path.join(testcase, 'nativefile'),
+                              '--cross-file', os.path.join(testcase, 'crossfile'),
+                              '--cross-file', os.path.join(testcase, 'crossfile2'),
+                              '-Ddef_bindir=binbar2',
+                              '-Ddef_datadir=databar',
+                              '-Ddef_includedir=includebar',
+                              '-Ddef_infodir=infobar',
+                              '-Ddef_libdir=libbar',
+                              '-Ddef_libexecdir=libexecbar',
+                              '-Ddef_localedir=localebar',
+                              '-Ddef_localstatedir=localstatebar',
+                              '-Ddef_mandir=manbar',
+                              '-Ddef_sbindir=sbinbar',
+                              '-Ddef_sharedstatedir=sharedstatebar',
+                              '-Ddef_sysconfdir=sysconfbar'])
 
 class TAPParserTests(unittest.TestCase):
     def assert_test(self, events, **kwargs):
diff --git a/test cases/unit/57 native file override/crossfile2 b/test cases/unit/57 native file override/crossfile2
new file mode 100644
index 000000000..70946c9e7
--- /dev/null
+++ b/test cases/unit/57 native file override/crossfile2	
@@ -0,0 +1,4 @@
+[paths]
+bindir = 'binbar2'
+
+; vim: ft=dosini