From 1b40379a79cb96d9ca8fb0d268a73fe7426fbf5c Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 26 Mar 2008 08:43:05 +0000 Subject: We should sort using LC_ALL=C to avoid locale issues. --- src/test/librc.funcs.hidden.list | 10 +++++----- src/test/rc.funcs.list | 24 ++++++++++++------------ src/test/runtests.sh | 12 ++++++------ 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/test') diff --git a/src/test/librc.funcs.hidden.list b/src/test/librc.funcs.hidden.list index 614fe3f..a21e21e 100644 --- a/src/test/librc.funcs.hidden.list +++ b/src/test/librc.funcs.hidden.list @@ -18,8 +18,8 @@ rc_runlevel_set rc_runlevel_starting rc_runlevel_stopping rc_service_add -rc_service_daemons_crashed rc_service_daemon_set +rc_service_daemons_crashed rc_service_delete rc_service_description rc_service_exists @@ -29,16 +29,16 @@ rc_service_mark rc_service_resolve rc_service_schedule_clear rc_service_schedule_start -rc_services_in_runlevel -rc_services_in_state -rc_services_scheduled -rc_services_scheduled_by rc_service_start rc_service_started_daemon rc_service_state rc_service_stop rc_service_value_get rc_service_value_set +rc_services_in_runlevel +rc_services_in_state +rc_services_scheduled +rc_services_scheduled_by rc_stringlist_add rc_stringlist_addu rc_stringlist_delete diff --git a/src/test/rc.funcs.list b/src/test/rc.funcs.list index 502867c..59dc215 100644 --- a/src/test/rc.funcs.list +++ b/src/test/rc.funcs.list @@ -15,9 +15,9 @@ rc_deptree_load@@RC_1.0 rc_deptree_order rc_deptree_order@@RC_1.0 rc_deptree_update +rc_deptree_update@@RC_1.0 rc_deptree_update_needed rc_deptree_update_needed@@RC_1.0 -rc_deptree_update@@RC_1.0 rc_find_pids rc_find_pids@@RC_1.0 rc_newer_than @@ -36,10 +36,10 @@ rc_runlevel_stopping rc_runlevel_stopping@@RC_1.0 rc_service_add rc_service_add@@RC_1.0 -rc_service_daemons_crashed -rc_service_daemons_crashed@@RC_1.0 rc_service_daemon_set rc_service_daemon_set@@RC_1.0 +rc_service_daemons_crashed +rc_service_daemons_crashed@@RC_1.0 rc_service_delete rc_service_delete@@RC_1.0 rc_service_description @@ -58,18 +58,10 @@ rc_service_schedule_clear rc_service_schedule_clear@@RC_1.0 rc_service_schedule_start rc_service_schedule_start@@RC_1.0 -rc_services_in_runlevel -rc_services_in_runlevel@@RC_1.0 -rc_services_in_state -rc_services_in_state@@RC_1.0 -rc_services_scheduled -rc_services_scheduled_by -rc_services_scheduled_by@@RC_1.0 -rc_services_scheduled@@RC_1.0 rc_service_start +rc_service_start@@RC_1.0 rc_service_started_daemon rc_service_started_daemon@@RC_1.0 -rc_service_start@@RC_1.0 rc_service_state rc_service_state@@RC_1.0 rc_service_stop @@ -78,6 +70,14 @@ rc_service_value_get rc_service_value_get@@RC_1.0 rc_service_value_set rc_service_value_set@@RC_1.0 +rc_services_in_runlevel +rc_services_in_runlevel@@RC_1.0 +rc_services_in_state +rc_services_in_state@@RC_1.0 +rc_services_scheduled +rc_services_scheduled@@RC_1.0 +rc_services_scheduled_by +rc_services_scheduled_by@@RC_1.0 rc_stringlist_add rc_stringlist_add@@RC_1.0 rc_stringlist_addu diff --git a/src/test/runtests.sh b/src/test/runtests.sh index 47bac3b..01e4dd8 100755 --- a/src/test/runtests.sh +++ b/src/test/runtests.sh @@ -24,14 +24,14 @@ ebegin "Checking exported symbols in libeinfo.so (data)" checkit einfo.data $( readelf -Ws ${libeinfo_builddir}/libeinfo.so \ | awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \ - | sort -u + | LC_ALL=C sort -u ) ebegin "Checking exported symbols in libeinfo.so (functions)" checkit einfo.funcs $( readelf -Ws ${libeinfo_builddir}/libeinfo.so \ | awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \ - | sort -u \ + | LC_ALL=C sort -u \ | egrep -v \ -e '^_(init|fini)$' ) @@ -40,25 +40,25 @@ ebegin "Checking exported symbols in librc.so (data)" checkit rc.data $( readelf -Ws ${librc_builddir}/librc.so \ | awk '$4 == "OBJECT" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \ - | sort -u + | LC_ALL=C sort -u ) ebegin "Checking exported symbols in librc.so (functions)" checkit rc.funcs $( readelf -Ws ${librc_builddir}/librc.so \ | awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $NF}' \ - | sort -u \ + | LC_ALL=C sort -u \ | egrep -v \ -e '^_(init|fini)$' ) ebegin "Checking hidden functions in librc.so" sed -n '/^librc_hidden_proto/s:.*(\(.*\))$:\1:p' ${librc_srcdir}/librc.h \ - | sort -u \ + | LC_ALL=C sort -u \ > librc.funcs.hidden.list readelf -Wr $(grep -l '#include[[:space:]]"librc\.h"' ${librc_srcdir}/*.c | sed 's:\.c$:.o:') \ | awk '$5 ~ /^rc_/ {print $5}' \ - | sort -u \ + | LC_ALL=C sort -u \ | egrep -v '^rc_environ_fd$' \ > librc.funcs.hidden.out syms=$(diff -u librc.funcs.hidden.list librc.funcs.hidden.out | sed -n '/^+[^+]/s:^+::p') -- cgit v1.2.3