diff options
| author | James McCoy <jamessan@debian.org> | 2022-04-10 10:48:44 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@debian.org> | 2022-04-10 10:48:44 -0400 |
| commit | e28577d9b9c9f6268119d04dd86a54903805d780 (patch) | |
| tree | efce54742231adc56c7946a893923f5b072fdb63 /build | |
| parent | 78244ea11cf40c29832465524004137fa9e58e2d (diff) | |
New upstream version 1.14.2
Diffstat (limited to 'build')
| -rw-r--r-- | build/ac-macros/macosx.m4 | 31 | ||||
| -rwxr-xr-x | build/run_tests.py | 6 |
2 files changed, 21 insertions, 16 deletions
diff --git a/build/ac-macros/macosx.m4 b/build/ac-macros/macosx.m4 index 92fa58e..b131379 100644 --- a/build/ac-macros/macosx.m4 +++ b/build/ac-macros/macosx.m4 @@ -23,22 +23,25 @@ dnl SVN_LIB_MACHO_ITERATE dnl Check for _dyld_image_name and _dyld_image_header availability AC_DEFUN(SVN_LIB_MACHO_ITERATE, [ - AC_MSG_CHECKING([for Mach-O dynamic module iteration functions]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ - #include <mach-o/dyld.h> - #include <mach-o/loader.h> - ]],[[ - const struct mach_header *header = _dyld_get_image_header(0); - const char *name = _dyld_get_image_name(0); - if (name && header) return 0; - return 1; - ]])],[ + AC_CACHE_CHECK([for Mach-O dynamic module iteration functions], + [ac_cv_mach_o_dynamic_module_iteration_works], [ + AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + #include <mach-o/dyld.h> + #include <mach-o/loader.h> + ]],[[ + const struct mach_header *header = _dyld_get_image_header(0); + const char *name = _dyld_get_image_name(0); + if (name && header) return 0; + return 1; + ]])], + [ac_cv_mach_o_dynamic_module_iteration_works=yes], + [ac_cv_mach_o_dynamic_module_iteration_works=no], + [ac_cv_mach_o_dynamic_module_iteration_works=no]) + ]) + if test "$ac_cv_mach_o_dynamic_module_iteration_works" = yes; then AC_DEFINE([SVN_HAVE_MACHO_ITERATE], [1], [Is Mach-O low-level _dyld API available?]) - AC_MSG_RESULT([yes]) - ],[ - AC_MSG_RESULT([no]) - ]) + fi ]) dnl SVN_LIB_MACOS_PLIST diff --git a/build/run_tests.py b/build/run_tests.py index 7b4eb15..25dbdec 100755 --- a/build/run_tests.py +++ b/build/run_tests.py @@ -776,10 +776,12 @@ class TestHarness: # ### Even if failure==1 it could be that the test didn't run at all. if test_failed and test_failed != 1: if self.log: - log.write('FAIL: %s: Unknown test failure; see tests.log.\n' % progbase) + log.write('FAIL: %s: Unknown test failure (%s); see tests.log.\n' + % (progbase, test_failed)) log.flush() else: - log.write('FAIL: %s: Unknown test failure.\n' % progbase) + log.write('FAIL: %s: Unknown test failure (%s).\n' + % (progbase, test_failed)) def _run_c_test(self, progabs, progdir, progbase, test_nums, dot_count): 'Run a c test, escaping parameters as required.' |