Try to fix the test on OS X.

On OS X the paths are absolute and there is one -rpath option per
subproject.

Unfortunately we cannot just look for

-rpath,.*/subprojects/sub1.*/subprojects/sub2

as on linux the -rpath option is followed by -rpath-link and the test
would pass even without the patch.

1 files changed, 5 insertions, 1 deletions

diff --git a/run_unittests.py b/run_unittests.py
index 90ac418..806390c 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3584,10 +3584,14 @@ endian = 'little'
             raise unittest.SkipTest('rpath are not used on Cygwin')
         testdir = os.path.join(self.unit_test_dir, '35 rpath order')
         self.init(testdir)
+        if is_osx():
+            rpathre = re.compile('-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2')
+        else:
+            rpathre = re.compile('-rpath,\$\$ORIGIN/subprojects/sub1:\$\$ORIGIN/subprojects/sub2')
         with open(os.path.join(self.builddir, 'build.ninja')) as bfile:
             for line in bfile:
                 if '-rpath' in line:
-                    self.assertIn('-rpath,$$ORIGIN/subprojects/sub1:$$ORIGIN/subprojects/sub2', line)
+                    self.assertRegex(line, rpathre)
                     return
         raise RuntimeError('Could not find the rpath')