From: Zbigniew Jędrzejewski-Szmek Date: Mon, 28 May 2018 07:38:14 +0000 (+0200) Subject: test-tables*: sort X-Git-Tag: v239~196^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=279eadd9330dd2f874112fb10bb445af685bd75f;p=thirdparty%2Fsystemd.git test-tables*: sort --- diff --git a/src/machine/test-machine-tables.c b/src/machine/test-machine-tables.c index 0e39e895e80..78ba00c2a4b 100644 --- a/src/machine/test-machine-tables.c +++ b/src/machine/test-machine-tables.c @@ -9,9 +9,9 @@ #include "test-tables.h" int main(int argc, char **argv) { + test_table(kill_who, KILL_WHO); test_table(machine_class, MACHINE_CLASS); test_table(machine_state, MACHINE_STATE); - test_table(kill_who, KILL_WHO); return EXIT_SUCCESS; } diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index eee91d11d2d..15097b88adf 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,28 +1,28 @@ #include "dhcp6-internal.h" #include "dhcp6-protocol.h" #include "ethtool-util.h" -#include "netlink-internal.h" #include "netdev/bond.h" #include "netdev/ipvlan.h" #include "netdev/macvlan.h" +#include "netlink-internal.h" #include "networkd-link.h" #include "networkd-util.h" #include "test-tables.h" int main(int argc, char **argv) { - test_table(bond_mode, NETDEV_BOND_MODE); - /* test_table(link_state, LINK_STATE); — not a reversible mapping */ - test_table(link_operstate, LINK_OPERSTATE); test_table(address_family_boolean, ADDRESS_FAMILY_BOOLEAN); - test_table(netdev_kind, NETDEV_KIND); + test_table(bond_mode, NETDEV_BOND_MODE); test_table(dhcp6_message_status, DHCP6_STATUS); test_table(duplex, DUP); - test_table(wol, WOL); + test_table(link_operstate, LINK_OPERSTATE); + /* test_table(link_state, LINK_STATE); — not a reversible mapping */ + test_table(netdev_kind, NETDEV_KIND); test_table(nl_union_link_info_data, NL_UNION_LINK_INFO_DATA); + test_table(wol, WOL); - test_table_sparse(macvlan_mode, NETDEV_MACVLAN_MODE); - test_table_sparse(ipvlan_mode, NETDEV_IPVLAN_MODE); test_table_sparse(dhcp6_message_type, DHCP6_MESSAGE); + test_table_sparse(ipvlan_mode, NETDEV_IPVLAN_MODE); + test_table_sparse(macvlan_mode, NETDEV_MACVLAN_MODE); return EXIT_SUCCESS; } diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 164bce0e98c..c85e81569d9 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -39,22 +39,23 @@ int main(int argc, char **argv) { test_table(architecture, ARCHITECTURE); + test_table(assert_type, CONDITION_TYPE); test_table(automount_result, AUTOMOUNT_RESULT); test_table(automount_state, AUTOMOUNT_STATE); test_table(cgroup_device_policy, CGROUP_DEVICE_POLICY); - test_table(condition_type, CONDITION_TYPE); - test_table(assert_type, CONDITION_TYPE); test_table(condition_result, CONDITION_RESULT); + test_table(condition_type, CONDITION_TYPE); test_table(device_state, DEVICE_STATE); + test_table(emergency_action, EMERGENCY_ACTION); test_table(exec_input, EXEC_INPUT); test_table(exec_output, EXEC_OUTPUT); - test_table(emergency_action, EMERGENCY_ACTION); test_table(job_mode, JOB_MODE); test_table(job_result, JOB_RESULT); test_table(job_state, JOB_STATE); test_table(job_type, JOB_TYPE); test_table(kill_mode, KILL_MODE); test_table(kill_who, KILL_WHO); + test_table(locale_variable, VARIABLE_LC); test_table(log_target, LOG_TARGET); test_table(mac_policy, MACPOLICY); test_table(manager_state, MANAGER_STATE); @@ -98,7 +99,6 @@ int main(int argc, char **argv) { test_table(unit_file_state, UNIT_FILE_STATE); test_table(unit_load_state, UNIT_LOAD_STATE); test_table(unit_type, UNIT_TYPE); - test_table(locale_variable, VARIABLE_LC); test_table(virtualization, VIRTUALIZATION); test_table_sparse(object_compressed, OBJECT_COMPRESSED);