]> git.pld-linux.org Git - packages/coreutils.git/blame - tests.patch
- updated to 8.23
[packages/coreutils.git] / tests.patch
CommitLineData
389abdcd
JR
1--- coreutils-8.21/tests/misc/printenv.sh~ 2013-01-31 01:46:24.000000000 +0100
2+++ coreutils-8.21/tests/misc/printenv.sh 2013-12-03 12:25:51.949012868 +0100
3@@ -23,8 +23,8 @@
4 # printenv as a builtin, so we must invoke it via "env".
5 # But beware of $_, set by many shells to the last command run.
6 # Also, filter out LD_PRELOAD, which is set when running under valgrind.
7-env | grep -Ev '^(_|LD_PRELOAD=)' > exp || framework_failure_
8-env -- printenv | grep -Ev '^(_|LD_PRELOAD=)' > out || fail=1
9+env | grep -Ev '^(_|LD_PRELOAD=|RANDOM=)' > exp || framework_failure_
10+env -- printenv | grep -Ev '^(_|LD_PRELOAD=|RANDOM=)' > out || fail=1
11 compare exp out || fail=1
12
13 # POSIX is clear that environ may, but need not be, sorted.
14--- coreutils-8.21/tests/misc/realpath.sh.orig 2013-12-03 12:36:46.105079823 +0100
15+++ coreutils-8.21/tests/misc/realpath.sh 2013-12-03 12:46:44.854069134 +0100
16@@ -16,8 +16,8 @@
17 # You should have received a copy of the GNU General Public License
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
19
20-. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
21-print_ver_ realpath
22+. "${srcdir=.}/tests/init.sh"; path_prepend_ $initial_cwd_/src
23+print_ver_ $initial_cwd_/src/realpath
24
25 stat_single=$(stat -c %d:%i /) || framework_failure_
26 stat_double=$(stat -c %d:%i //) || framework_failure_
27@@ -40,68 +40,68 @@
28 ln -s /// three || framework_failure_
29
30 # Basic operation
31-realpath -Pqz . >/dev/null || fail=1
32+$initial_cwd_/src/realpath -Pqz . >/dev/null || fail=1
33 # Operand is required
34-realpath >/dev/null && fail=1
35-realpath --relative-base . --relative-to . && fail=1
36-realpath --relative-base . && fail=1
37+$initial_cwd_/src/realpath >/dev/null && fail=1
38+$initial_cwd_/src/realpath --relative-base . --relative-to . && fail=1
39+$initial_cwd_/src/realpath --relative-base . && fail=1
40
41 # -e --relative-* require directories
42-realpath -e --relative-to=dir1/f --relative-base=. . && fail=1
43-realpath -e --relative-to=dir1/ --relative-base=. . || fail=1
44+$initial_cwd_/src/realpath -e --relative-to=dir1/f --relative-base=. . && fail=1
45+$initial_cwd_/src/realpath -e --relative-to=dir1/ --relative-base=. . || fail=1
46
47 # Note NUL params are unconditionally rejected by canonicalize_filename_mode
48-realpath -m '' && fail=1
49-realpath --relative-base= --relative-to=. . && fail=1
50+$initial_cwd_/src/realpath -m '' && fail=1
51+$initial_cwd_/src/realpath --relative-base= --relative-to=. . && fail=1
52
53 # symlink resolution
54-this=$(realpath .)
55-test "$(realpath ldir2/..)" = "$this/dir1" || fail=1
56-test "$(realpath -L ldir2/..)" = "$this" || fail=1
57-test "$(realpath -s ldir2)" = "$this/ldir2" || fail=1
58+this=$($initial_cwd_/src/realpath .)
59+test "$($initial_cwd_/src/realpath ldir2/..)" = "$this/dir1" || fail=1
60+test "$($initial_cwd_/src/realpath -L ldir2/..)" = "$this" || fail=1
61+test "$($initial_cwd_/src/realpath -s ldir2)" = "$this/ldir2" || fail=1
62
63 # relative string handling
64-test $(realpath -m --relative-to=prefix prefixed/1) = '../prefixed/1' || fail=1
65-test $(realpath -m --relative-to=prefixed prefix/1) = '../prefix/1' || fail=1
66-test $(realpath -m --relative-to=prefixed prefixed/1) = '1' || fail=1
67+test $($initial_cwd_/src/realpath -m --relative-to=prefix prefixed/1) = '../prefixed/1' || fail=1
68+test $($initial_cwd_/src/realpath -m --relative-to=prefixed prefix/1) = '../prefix/1' || fail=1
69+test $($initial_cwd_/src/realpath -m --relative-to=prefixed prefixed/1) = '1' || fail=1
70
71 # Ensure no redundant trailing '/' present, as was the case in v8.15
72-test $(realpath -sm --relative-to=/usr /) = '..' || fail=1
73+test $($initial_cwd_/src/realpath -sm --relative-to=/usr /) = '..' || fail=1
74 # Ensure no redundant leading '../' present, as was the case in v8.15
75-test $(realpath -sm --relative-to=/ /usr) = 'usr' || fail=1
76+test $($initial_cwd_/src/realpath -sm --relative-to=/ /usr) = 'usr' || fail=1
77
78 # Ensure --relative-base works
79-out=$(realpath -sm --relative-base=/usr --relative-to=/usr /tmp /usr) || fail=1
80+out=$($initial_cwd_/src/realpath -sm --relative-base=/usr --relative-to=/usr /tmp /usr) || fail=1
81 test "$out" = "/tmp$nl." || fail=1
82-out=$(realpath -sm --relative-base=/ --relative-to=/ / /usr) || fail=1
83+out=$($initial_cwd_/src/realpath -sm --relative-base=/ --relative-to=/ / /usr) || fail=1
84 test "$out" = ".${nl}usr" || fail=1
85 # --relative-to defaults to the value of --relative-base
86-out=$(realpath -sm --relative-base=/usr /tmp /usr) || fail=1
87+out=$($initial_cwd_/src/realpath -sm --relative-base=/usr /tmp /usr) || fail=1
88 test "$out" = "/tmp$nl." || fail=1
89-out=$(realpath -sm --relative-base=/ / /usr) || fail=1
90+out=$($initial_cwd_/src/realpath -sm --relative-base=/ / /usr) || fail=1
91 test "$out" = ".${nl}usr" || fail=1
92 # For now, --relative-base must be a prefix of --relative-to, or all output
93 # will be absolute (compare to MacOS 'relpath -d dir start end').
94-out=$(realpath -sm --relative-base=/usr/local --relative-to=/usr \
95+out=$($initial_cwd_/src/realpath -sm --relative-base=/usr/local --relative-to=/usr \
96 /usr /usr/local) || fail=1
97 test "$out" = "/usr${nl}/usr/local" || fail=1
98
99 # Ensure // is handled correctly.
100-test "$(realpath / // ///)" = "/$nl$double_slash$nl/" || fail=1
101-test "$(realpath one two three)" = "/$nl$double_slash$nl/" || fail=1
102-out=$(realpath -sm --relative-to=/ / // /dev //dev) || fail=1
103+test "$($initial_cwd_/src/realpath / // ///)" = "/$nl$double_slash$nl/" || fail=1
104+test "$($initial_cwd_/src/realpath one two three)" = "/$nl$double_slash$nl/" || fail=1
105+out=$($initial_cwd_/src/realpath -sm --relative-to=/ / // /dev //dev) || fail=1
106 if test $double_slash = //; then
107 test "$out" = ".$nl//${nl}dev$nl//dev" || fail=1
108 else
109 test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1
110 fi
111-out=$(realpath -sm --relative-to=// / // /dev //dev) || fail=1
112+out=$($initial_cwd_/src/realpath -sm --relative-to=// / // /dev //dev) || fail=1
113 if test $double_slash = //; then
114 test "$out" = "/$nl.$nl/dev${nl}dev" || fail=1
115 else
116 test "$out" = ".$nl.${nl}dev${nl}dev" || fail=1
117 fi
118-out=$(realpath --relative-base=/ --relative-to=// / //) || fail=1
119+out=$($initial_cwd_/src/realpath --relative-base=/ --relative-to=// / //) || fail=1
120 if test $double_slash = //; then
121 test "$out" = "/$nl//" || fail=1
122 else
8127c87d
JB
123--- coreutils-8.23/tests/misc/nohup.sh.orig 2014-07-20 19:03:44.627770671 +0200
124+++ coreutils-8.23/tests/misc/nohup.sh 2014-07-20 19:10:31.097753613 +0200
125@@ -61,23 +61,23 @@
1929b611
JR
126
127 # Bug present through coreutils 8.0: failure to print advisory message
128 # to stderr must be fatal. Requires stdout to be terminal.
129-if test -w /dev/full && test -c /dev/full; then
130-(
8127c87d
JB
131- # POSIX shells immediately exit the subshell on exec error.
132- # So check we can write to /dev/tty before the exec, which
133- # isn't possible if we've no controlling tty for example.
134- test -c /dev/tty && >/dev/tty || exit 0
135-
1929b611
JR
136- exec >/dev/tty
137- test -t 1 || exit 0
138- nohup echo hi 2> /dev/full
139- test $? = 125 || fail=1
140- test -f nohup.out || fail=1
8127c87d 141- compare /dev/null nohup.out || fail=1
1929b611
JR
142- rm -f nohup.out
143- exit $fail
144-) || fail=1
145-fi
146+#if test -w /dev/full && test -c /dev/full; then
147+#(
8127c87d
JB
148+# # POSIX shells immediately exit the subshell on exec error.
149+# # So check we can write to /dev/tty before the exec, which
150+# # isn't possible if we've no controlling tty for example.
151+# test -c /dev/tty && >/dev/tty || exit 0
152+#
1929b611
JR
153+# exec >/dev/tty
154+# test -t 1 || exit 0
155+# nohup echo hi 2> /dev/full
156+# test $? = 125 || fail=1
157+# test -f nohup.out || fail=1
8127c87d 158+# compare /dev/null nohup.out || fail=1
1929b611
JR
159+# rm -f nohup.out
160+# exit $fail
161+#) || fail=1
162+#fi
163
164 nohup no-such-command 2> err
165 errno=$?
34bfce28
JR
166--- coreutils-8.21/gnulib-tests/test-utimens-common.h~ 2013-01-02 13:34:46.000000000 +0100
167+++ coreutils-8.21/gnulib-tests/test-utimens-common.h 2013-12-03 14:10:06.406077452 +0100
168@@ -48,7 +48,7 @@
169 : 0)
170 };
171
172-# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
173+# if 1
174 /* Skip ctime tests on native Windows, since it is either a copy of
175 mtime or birth time (depending on the file system), rather than a
176 properly tracked change time. */
91d1b03f
JR
177--- coreutils-8.21/gnulib-tests/test-stat-time.c~ 2013-01-02 13:34:46.000000000 +0100
178+++ coreutils-8.21/gnulib-tests/test-stat-time.c 2013-12-03 14:39:35.423872940 +0100
179@@ -184,7 +184,7 @@
180 }
181 }
182
183-#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
184+#if 1
185 /* Skip the ctime tests on native Windows platforms, because their
186 st_ctime is either the same as st_mtime (plus or minus an offset)
187 or set to the file _creation_ time, and is not influenced by rename
74811ba6
JB
188--- coreutils-8.22/gnulib-tests/gnulib.mk.orig 2013-12-14 12:14:47.200742771 +0100
189+++ coreutils-8.22/gnulib-tests/gnulib.mk 2013-12-14 12:17:30.570735914 +0100
91d1b03f
JR
190@@ -259,9 +259,9 @@
191
192 ## begin gnulib module chown-tests
193
194-TESTS += test-chown
195-check_PROGRAMS += test-chown
74811ba6 196-test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
91d1b03f
JR
197+#TESTS += test-chown
198+#check_PROGRAMS += test-chown
74811ba6
JB
199+#test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
200 EXTRA_DIST += nap.h test-chown.h test-chown.c signature.h macros.h
91d1b03f
JR
201
202 ## end gnulib module chown-tests
74811ba6 203@@ -460,9 +460,9 @@
91d1b03f
JR
204
205 ## begin gnulib module fchownat-tests
206
207-TESTS += test-fchownat
208-check_PROGRAMS += test-fchownat
74811ba6 209-test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
91d1b03f
JR
210+#TESTS += test-fchownat
211+#check_PROGRAMS += test-fchownat
74811ba6
JB
212+#test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
213 EXTRA_DIST += nap.h test-chown.h test-lchown.h test-fchownat.c signature.h macros.h
91d1b03f
JR
214
215 ## end gnulib module fchownat-tests
74811ba6 216@@ -527,10 +527,10 @@
d9b4a544
JR
217
218 ## begin gnulib module fdutimensat-tests
219
220-TESTS += test-fdutimensat
221-check_PROGRAMS += test-fdutimensat
74811ba6
JB
222-test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
223- $(LIB_NANOSLEEP) @LIBINTL@
d9b4a544
JR
224+#TESTS += test-fdutimensat
225+#check_PROGRAMS += test-fdutimensat
74811ba6
JB
226+#test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
227+# $(LIB_NANOSLEEP) @LIBINTL@
228 EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-fdutimensat.c macros.h
d9b4a544
JR
229
230 ## end gnulib module fdutimensat-tests
74811ba6 231@@ -782,9 +782,9 @@
79fc3bf6
JR
232
233 ## begin gnulib module futimens-tests
234
235-TESTS += test-futimens
236-check_PROGRAMS += test-futimens
74811ba6 237-test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
79fc3bf6
JR
238+#TESTS += test-futimens
239+#check_PROGRAMS += test-futimens
74811ba6
JB
240+#test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
241 EXTRA_DIST += nap.h test-futimens.h test-utimens-common.h test-futimens.c signature.h macros.h
79fc3bf6
JR
242
243 ## end gnulib module futimens-tests
74811ba6 244@@ -1107,9 +1107,9 @@
91d1b03f
JR
245
246 ## begin gnulib module lchown-tests
247
248-TESTS += test-lchown
249-check_PROGRAMS += test-lchown
74811ba6 250-test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
91d1b03f
JR
251+#TESTS += test-lchown
252+#check_PROGRAMS += test-lchown
74811ba6
JB
253+#test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
254 EXTRA_DIST += nap.h test-lchown.h test-lchown.c signature.h macros.h
91d1b03f
JR
255
256 ## end gnulib module lchown-tests
74811ba6 257@@ -2428,9 +2428,9 @@
05e16918
JR
258
259 ## begin gnulib module utimens-tests
260
261-TESTS += test-utimens
262-check_PROGRAMS += test-utimens
74811ba6 263-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
05e16918
JR
264+#TESTS += test-utimens
265+#check_PROGRAMS += test-utimens
74811ba6
JB
266+#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
267 EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
05e16918
JR
268
269 ## end gnulib module utimens-tests
This page took 0.153339 seconds and 4 git commands to generate.