Merge branch '3787_extfs_tester_sort_locale'

* 3787_extfs_tester_sort_locale:
  Ticket #3787: extfs: tests for helpers using 'sort' may fail.
This commit is contained in:
Mooffie 2017-03-08 14:03:42 +02:00
commit fc33f62aaf
6 changed files with 39 additions and 28 deletions

View File

@ -1,27 +1,27 @@
-rw-r--r-- 1 <<uid>> <<gid>> 469920 2011-11-03 02:33:04 cpuidsdk64.dll
-rw-r--r-- 1 <<uid>> <<gid>> 445814 2011-11-03 02:33:04 cpuidsdk.dll
-rw-r--r-- 1 <<uid>> <<gid>> 1178084 2011-11-03 02:33:04 Geekbench22.exe
-rw-r--r-- 1 <<uid>> <<gid>> 101652 2011-11-03 02:33:04 geekbench.exe
-rw-r--r-- 1 <<uid>> <<gid>> 737580 2011-11-03 02:33:04 geekbench.plar
-rw-r--r-- 1 <<uid>> <<gid>> 1058731 2011-11-03 02:33:06 geekbench_x86_32.exe
-rw-r--r-- 1 <<uid>> <<gid>> 1192155 2011-11-03 02:33:06 geekbench_x86_64.exe
-rw-r--r-- 1 <<uid>> <<gid>> 6144 2007-07-07 07:07:07 $PLUGINSDIR/AdvSplash.dll
-rw-r--r-- 1 <<uid>> <<gid>> 8005 2007-07-07 07:07:07 $PLUGINSDIR/InstallOptions.dll
-rw-r--r-- 1 <<uid>> <<gid>> 3328 2007-07-07 07:07:07 $PLUGINSDIR/StartMenu.dll
-rw-r--r-- 1 <<uid>> <<gid>> 134 2007-11-15 01:12:38 $PLUGINSDIR/ioSpecial.ini
-rw-r--r-- 1 <<uid>> <<gid>> 1886 2003-09-24 00:34:00 $PLUGINSDIR/modern-wizard.bmp
-rw-r--r-- 1 <<uid>> <<gid>> 28016 2006-08-11 23:49:28 $PLUGINSDIR/splash.bmp
-rw-r--r-- 1 <<uid>> <<gid>> 4014 2011-11-03 02:23:16 $_OUTDIR/html/ui/bg-repeat.gif
-rw-r--r-- 1 <<uid>> <<gid>> 12817 2011-11-03 02:23:16 $_OUTDIR/html/ui/callout-bg-bottom.gif
-rw-r--r-- 1 <<uid>> <<gid>> 14648 2011-11-03 02:23:16 $_OUTDIR/html/ui/callout-bg-top.gif
-rw-r--r-- 1 <<uid>> <<gid>> 120 2011-11-03 02:23:16 $_OUTDIR/html/ui/graph-background.png
-rw-r--r-- 1 <<uid>> <<gid>> 9854 2011-11-03 02:23:16 $_OUTDIR/html/ui/heading-bg.gif
-rw-r--r-- 1 <<uid>> <<gid>> 861 2011-11-03 02:23:16 $_OUTDIR/html/ui/heading-bg-left.gif
-rw-r--r-- 1 <<uid>> <<gid>> 9854 2011-11-03 02:23:16 $_OUTDIR/html/ui/heading-bg.gif
-rw-r--r-- 1 <<uid>> <<gid>> 30401 2011-11-03 02:23:16 $_OUTDIR/html/ui/logo.gif
-rw-r--r-- 1 <<uid>> <<gid>> 1431 2011-11-03 02:23:16 $_OUTDIR/html/ui/nav-arrow-down.gif
-rw-r--r-- 1 <<uid>> <<gid>> 1425 2011-11-03 02:23:16 $_OUTDIR/html/ui/nav-arrows-bg.gif
-rw-r--r-- 1 <<uid>> <<gid>> 1446 2011-11-03 02:23:16 $_OUTDIR/html/ui/nav-arrow-up.gif
-rw-r--r-- 1 <<uid>> <<gid>> 2885 2011-11-03 02:23:16 $_OUTDIR/html/ui/table-wrapper-bg-repeat.gif
-rw-r--r-- 1 <<uid>> <<gid>> 1425 2011-11-03 02:23:16 $_OUTDIR/html/ui/nav-arrows-bg.gif
-rw-r--r-- 1 <<uid>> <<gid>> 3841 2011-11-03 02:23:16 $_OUTDIR/html/ui/table-wrapper-bg-repeat-x.gif
-rw-r--r-- 1 <<uid>> <<gid>> 2885 2011-11-03 02:23:16 $_OUTDIR/html/ui/table-wrapper-bg-repeat.gif
-rw-r--r-- 1 <<uid>> <<gid>> 142162 2011-11-03 02:23:16 $_OUTDIR/ux/splash-screen.png
-rw-r--r-- 1 <<uid>> <<gid>> 6144 2007-07-07 07:07:07 $PLUGINSDIR/AdvSplash.dll
-rw-r--r-- 1 <<uid>> <<gid>> 8005 2007-07-07 07:07:07 $PLUGINSDIR/InstallOptions.dll
-rw-r--r-- 1 <<uid>> <<gid>> 134 2007-11-15 01:12:38 $PLUGINSDIR/ioSpecial.ini
-rw-r--r-- 1 <<uid>> <<gid>> 1886 2003-09-24 00:34:00 $PLUGINSDIR/modern-wizard.bmp
-rw-r--r-- 1 <<uid>> <<gid>> 28016 2006-08-11 23:49:28 $PLUGINSDIR/splash.bmp
-rw-r--r-- 1 <<uid>> <<gid>> 3328 2007-07-07 07:07:07 $PLUGINSDIR/StartMenu.dll
-rw-r--r-- 1 <<uid>> <<gid>> 1178084 2011-11-03 02:33:04 Geekbench22.exe
-rw-r--r-- 1 <<uid>> <<gid>> 445814 2011-11-03 02:33:04 cpuidsdk.dll
-rw-r--r-- 1 <<uid>> <<gid>> 469920 2011-11-03 02:33:04 cpuidsdk64.dll
-rw-r--r-- 1 <<uid>> <<gid>> 101652 2011-11-03 02:33:04 geekbench.exe
-rw-r--r-- 1 <<uid>> <<gid>> 737580 2011-11-03 02:33:04 geekbench.plar
-rw-r--r-- 1 <<uid>> <<gid>> 1058731 2011-11-03 02:33:06 geekbench_x86_32.exe
-rw-r--r-- 1 <<uid>> <<gid>> 1192155 2011-11-03 02:33:06 geekbench_x86_64.exe
-rw-r--r-- 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 plugins/shared memory/uninstall.exe

View File

@ -1,9 +1,9 @@
-rw-r--r-- 1 <<uid>> <<gid>> 469920 2011-11-01 01:33:04 cpuidsdk64.dll
-rw-r--r-- 1 <<uid>> <<gid>> 17770090 2007-07-07 07:07:07 no-date-cpuidsdk64.dll
drwxr-xr-x 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-$_OUTDIR/html/ui
drwxr-xr-x 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-test
-rw-r--r-- 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-test.dll
drwxr-xr-x 1 <<uid>> <<gid>> 0 2011-11-02 02:23:16 $_OUTDIR/html/ui
-rw-r--r-- 1 <<uid>> <<gid>> 17897 2011-11-05 05:23:16 $_OUTDIR/html/ui/callout-bg-bottom.gif
-rw-r--r-- 1 <<uid>> <<gid>> 469920 2011-11-01 01:33:04 cpuidsdk64.dll
drwxr-xr-x 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-$_OUTDIR/html/ui
-rw-r--r-- 1 <<uid>> <<gid>> 17770090 2007-07-07 07:07:07 no-date-cpuidsdk64.dll
drwxr-xr-x 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-test
-rw-r--r-- 1 <<uid>> <<gid>> 0 2007-07-07 07:07:07 no-date-test.dll
drwxr-xr-x 1 <<uid>> <<gid>> 0 2011-11-04 04:23:16 test
-rw-r--r-- 1 <<uid>> <<gid>> 0 2011-11-03 03:33:04 test.dll

View File

@ -20,7 +20,7 @@
-rw-r--r-- 1 <<uid>> <<gid>> 233 2005-11-14 04:41:01 vp
-rw-r--r-- 1 <<uid>> <<gid>> 0 2016-12-18 22:30:42 with spaces.txt
drwxr-xr-x 1 <<uid>> <<gid>> 0 2016-10-26 08:35:48 x
-rw-r--r-- 1 <<uid>> <<gid>> 58 2003-02-17 15:11:46 xcopy
-rw-r--r-- 1 <<uid>> <<gid>> 340 2010-01-31 23:04:48 x/.xsession
drwxr-xr-x 1 <<uid>> <<gid>> 0 2009-05-03 21:01:33 x/etc
drwxr-xr-x 1 <<uid>> <<gid>> 0 2009-05-03 21:02:13 x/etc/X11
drwxr-xr-x 1 <<uid>> <<gid>> 0 2006-05-02 10:12:38 x/etc/X11/xinit
@ -33,10 +33,10 @@ drwxr-xr-x 1 <<uid>> <<gid>> 0 2005-12-04 19:15:47 x/etc/X11/xinit/
-rw-r--r-- 1 <<uid>> <<gid>> 81 2005-09-02 17:36:13 x/etc/X11/xinit/xinitrc.d/xmbind.sh
drwxr-xr-x 1 <<uid>> <<gid>> 0 2009-05-03 21:07:38 x/etc/X11/xkb
-rw-r--r-- 1 <<uid>> <<gid>> 71 2009-05-03 21:07:38 x/etc/X11/xkb/note.txt
-rw-r--r-- 1 <<uid>> <<gid>> 58 2003-02-17 15:10:46 xpaste
-rw-r--r-- 1 <<uid>> <<gid>> 489 2003-08-03 01:46:40 x/setxkb
-rw-r--r-- 1 <<uid>> <<gid>> 142 2003-03-09 14:08:01 x/setxkb2
-rw-r--r-- 1 <<uid>> <<gid>> 158 2002-11-08 13:28:37 x/x
-rw-r--r-- 1 <<uid>> <<gid>> 3746 2006-12-07 11:30:57 x/xinitrc
-rw-r--r-- 1 <<uid>> <<gid>> 42 2006-12-07 11:28:18 x/xs
-rw-r--r-- 1 <<uid>> <<gid>> 340 2010-01-31 23:04:48 x/.xsession
-rw-r--r-- 1 <<uid>> <<gid>> 58 2003-02-17 15:11:46 xcopy
-rw-r--r-- 1 <<uid>> <<gid>> 58 2003-02-17 15:10:46 xpaste

View File

@ -1,9 +1,9 @@
drwx------ 1 <<uid>> <<gid>> 0 2016-06-07 20:43:00 ./.dosbox
-rw-rw-r-- 1 <<uid>> <<gid>> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf
-rw-r--r-- 1 <<uid>> <<gid>> 6 2016-11-23 07:39:00 ./filename with spaces.txt
-rw-rw-r-- 1 <<uid>> <<gid>> 5869937 2016-11-23 07:43:00 ./log.txt
-rw------- 1 <<uid>> <<gid>> 11032 2016-11-23 07:10:00 ./.viminfo
-rw-rw-r-- 1 <<uid>> <<gid>> 205 2016-10-26 13:14:00 ./.wget-hsts
-rw-rw-r-- 1 <<uid>> <<gid>> 7527 2016-04-17 01:21:00 ./.xboardrc
-rw-rw-r-- 1 <<uid>> <<gid>> 559 2016-09-29 01:08:00 ./.xchm
-rw-rw-r-- 1 <<uid>> <<gid>> 130 2015-12-27 17:08:00 ./.xinputrc
-rw-r--r-- 1 <<uid>> <<gid>> 6 2016-11-23 07:39:00 ./filename with spaces.txt
-rw-rw-r-- 1 <<uid>> <<gid>> 5869937 2016-11-23 07:43:00 ./log.txt

View File

@ -1,9 +1,9 @@
drwx------ 1 <<uid>> <<gid>> 0 2016-06-07 20:43:00 ./.dosbox
-rw-rw-r-- 1 <<uid>> <<gid>> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf
-rw-r--r-- 1 <<uid>> <<gid>> 6 2016-11-23 07:39:00 ./filename with spaces.txt
-rw-rw-r-- 1 <<uid>> <<gid>> 5869937 2016-11-23 07:43:00 ./log.txt
-rw------- 1 <<uid>> <<gid>> 11032 2016-11-23 07:10:00 ./.viminfo
-rw-rw-r-- 1 <<uid>> <<gid>> 205 2016-10-26 13:14:00 ./.wget-hsts
-rw-rw-r-- 1 <<uid>> <<gid>> 7527 2016-04-17 01:21:00 ./.xboardrc
-rw-rw-r-- 1 <<uid>> <<gid>> 559 2016-09-29 01:08:00 ./.xchm
-rw-rw-r-- 1 <<uid>> <<gid>> 130 2015-12-27 17:08:00 ./.xinputrc
-rw-r--r-- 1 <<uid>> <<gid>> 6 2016-11-23 07:39:00 ./filename with spaces.txt
-rw-rw-r-- 1 <<uid>> <<gid>> 5869937 2016-11-23 07:43:00 ./log.txt

View File

@ -58,6 +58,17 @@ EOS
#"'
#
# Some helpers use the 'sort' utility. The "expected output" files we
# provide must be generated in the same locale these helpers are to be run
# by the tester or else 'sort' will produce a different output than ours,
# failing the tests.
#
# We settle on the C locale.
#
LC_ALL=C
export LC_ALL
############################ Global variables ##############################
# The directories used.