commit 05340ad8b45d229b9d56ceaa00ed046810b6d27f
author Philip Withnall <pwithnall@endlessos.org> Wed Nov 24 12:01:39 2021 +0000
committer Philip Withnall <pwithnall@endlessos.org> Wed Nov 24 15:20:25 2021 +0000
tree f33da296188111943548647d8b94d81ffb9fd8fa
parent 3562c9e16d04b8d0488c6bce8460f0c42882496e

tests: Allow `objcopy --help` to fail, because it fails on FreeBSD

This is a partial revert of b248f3481ced. Eventually, this commit can be
dropped once `objcopy --help` doesn’t exit with a non-zero status on
FreeBSD.

See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2360#note_1318608

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

gio/tests/meson.build

diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 3f29543..b563e8d 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -683,7 +683,14 @@
   objcopy_supports_add_symbol = false
   objcopy = find_program('objcopy', required : false)
   if objcopy.found()
-    objcopy_supports_add_symbol = run_command(objcopy, '--help', check: true).stdout().contains('--add-symbol')
+    # FIXME: This should be `check: true` because we never really expect
+    # `objcopy --help` to fail, given that `objcopy` exists. However, it does
+    # fail on FreeBSD because ELF Tool Chain has
+    # [a bug](https://sourceforge.net/p/elftoolchain/code/3950/).
+    # This can be changed back to `check: true` once our CI uses a FreeBSD
+    # version which includes the fix.
+    # See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2360#note_1318608
+    objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
   endif
 
   ld = find_program('ld', required : false)