diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2019-09-11 23:05:24 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-10-01 09:49:33 +0200 |
commit | 7e1aacaef253b7b58b099924a14d9c03868cbad2 (patch) | |
tree | 30c1aff5707c4ada5a4d82b643196ad9d095109f | |
parent | f0b7041063593361419a872df56d27502f174443 (diff) | |
download | NetworkManager-7e1aacaef253b7b58b099924a14d9c03868cbad2.tar.gz |
meson: Remove tests related to check_so_symbols
These tests are already working since 19a718bc1 so `FIXME` comments
are not needed anymore.
-rw-r--r-- | meson.build | 13 | ||||
-rw-r--r-- | src/devices/adsl/meson.build | 7 | ||||
-rw-r--r-- | src/devices/bluetooth/meson.build | 7 | ||||
-rw-r--r-- | src/devices/ovs/meson.build | 7 | ||||
-rw-r--r-- | src/devices/team/meson.build | 7 | ||||
-rw-r--r-- | src/devices/wifi/meson.build | 7 | ||||
-rw-r--r-- | src/devices/wwan/meson.build | 9 | ||||
-rw-r--r-- | src/settings/plugins/ifcfg-rh/meson.build | 12 | ||||
-rw-r--r-- | src/settings/plugins/ifupdown/meson.build | 12 |
9 files changed, 0 insertions, 81 deletions
diff --git a/meson.build b/meson.build index 4f93dd3a9a..20145fba49 100644 --- a/meson.build +++ b/meson.build @@ -808,19 +808,6 @@ fi content_files = [] -# FIXME: every plugin calls to this: -''' -set_sanitizer_env = \ - [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ - export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ - fi - -check_so_symbols = \ - $(call set_sanitizer_env,$(1)); \ - LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null -''' - subdir('introspection') subdir('shared') subdir('libnm-core') diff --git a/src/devices/adsl/meson.build b/src/devices/adsl/meson.build index 16fed29658..a5d1c4b474 100644 --- a/src/devices/adsl/meson.build +++ b/src/devices/adsl/meson.build @@ -21,10 +21,3 @@ test( check_exports, args: [libnm_device_plugin_adsl.full_path(), linker_script_devices], ) - -# FIXME: check_so_symbols replacement -''' -check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) -''' diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index 3540fb158c..d3489871f2 100644 --- a/src/devices/bluetooth/meson.build +++ b/src/devices/bluetooth/meson.build @@ -34,10 +34,3 @@ test( check_exports, args: [libnm_device_plugin_bluetooth.full_path(), linker_script_devices], ) - -# FIXME: check_so_symbols replacement -''' -check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so) -''' diff --git a/src/devices/ovs/meson.build b/src/devices/ovs/meson.build index cffe015ebe..27e1b4d02c 100644 --- a/src/devices/ovs/meson.build +++ b/src/devices/ovs/meson.build @@ -29,10 +29,3 @@ test( check_exports, args: [libnm_device_plugin_ovs.full_path(), linker_script_devices], ) - -# FIXME: check_so_symbols replacement -''' -check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/ovs/.libs/libnm-device-plugin-ovs.so) -''' diff --git a/src/devices/team/meson.build b/src/devices/team/meson.build index 147676b0ce..0e63183b5e 100644 --- a/src/devices/team/meson.build +++ b/src/devices/team/meson.build @@ -27,10 +27,3 @@ test( check_exports, args: [libnm_device_plugin_team.full_path(), linker_script_devices], ) - -# FIXME: check_so_symbols replacement -''' -check-local-devices-team: src/devices/team/libnm-device-plugin-team.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so) -''' diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build index 81b3d17d9c..f1c4af9625 100644 --- a/src/devices/wifi/meson.build +++ b/src/devices/wifi/meson.build @@ -38,13 +38,6 @@ test( args: [libnm_device_plugin_wifi.full_path(), linker_script_devices], ) -# FIXME: check_so_symbols replacement -''' -check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so) -''' - if enable_tests subdir('tests') endif diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build index 5a79096934..37d3c2ca4e 100644 --- a/src/devices/wwan/meson.build +++ b/src/devices/wwan/meson.build @@ -69,15 +69,6 @@ run_target( depends: libnm_device_plugin_wwan, ) -# FIXME: check_so_symbols replacement -''' -check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(srcdir)/linker-script-devices.ver" - $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so) - $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver" - $(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so) -''' - if enable_tests subdir('tests') endif diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build index 9cda662a43..d9dd3edba5 100644 --- a/src/settings/plugins/ifcfg-rh/meson.build +++ b/src/settings/plugins/ifcfg-rh/meson.build @@ -51,18 +51,6 @@ libnm_settings_plugin_ifcfg_rh = shared_module( core_plugins += libnm_settings_plugin_ifcfg_rh -# FIXME: check_so_symbols replacement -''' -run_target( - 'check-local-symbols-settings-ifcfg-rh', - command: [check_so_symbols, libnm_settings_plugin_ifcfg_rh.full_path()], - depends: libnm_settings_plugin_ifcfg_rh, -) - -check-local-symbols-settings-ifcfg-rh: src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ifcfg-rh/.libs/libnm-settings-plugin-ifcfg-rh.so) -''' - data = [ 'nm-ifdown', 'nm-ifup', diff --git a/src/settings/plugins/ifupdown/meson.build b/src/settings/plugins/ifupdown/meson.build index 78d353a56e..0cabe771fe 100644 --- a/src/settings/plugins/ifupdown/meson.build +++ b/src/settings/plugins/ifupdown/meson.build @@ -24,18 +24,6 @@ libnm_settings_plugin_ifupdown = shared_module( core_plugins += libnm_settings_plugin_ifupdown -# FIXME: check_so_symbols replacement -''' -run_target( - 'check-local-symbols-settings-ifupdown', - command: [check_so_symbols, libnm_settings_plugin_ifupdown.full_path()], - depends: libnm_settings_plugin_ifupdown, -) - -check-local-symbols-settings-ifupdown: src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ifupdown/.libs/libnm-settings-plugin-ifupdown.so) -''' - if enable_tests subdir('tests') endif |