- merged 9.5 from PLD

[packages/coreutils.git] / tests.patch

diff --git a/tests.patch b/tests.patch
index 9b30f6c5a36cce1a5b245653f13ac5c415e1bb85..fff60284e1efa200b8aa0e513e951a461583e17a 100644 (file)
--- a/tests.patch
+++ b/tests.patch
@@ -7,10 +7,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-chown
 -check_PROGRAMS += test-chown
--test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+-test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
 +#TESTS += test-chown
 +#check_PROGRAMS += test-chown
-+#test_chown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
++#test_chown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
  EXTRA_DIST += nap.h test-chown.h test-chown.c signature.h macros.h
  
  ## end   gnulib module chown-tests
@@ -20,10 +20,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-fchownat
 -check_PROGRAMS += test-fchownat
--test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
+-test_fchownat_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@
 +#TESTS += test-fchownat
 +#check_PROGRAMS += test-fchownat
-+#test_fchownat_LDADD = $(LDADD) $(LIB_NANOSLEEP) @LIBINTL@
++#test_fchownat_LDADD = $(LDADD) $(NANOSLEEP_LIB) @LIBINTL@
  EXTRA_DIST += nap.h test-chown.h test-lchown.h test-fchownat.c signature.h macros.h
  
  ## end   gnulib module fchownat-tests
@@ -33,12 +33,12 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-fdutimensat
 -check_PROGRAMS += test-fdutimensat
--test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
--  $(LIB_NANOSLEEP) @LIBINTL@
+-test_fdutimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) \
+-  $(NANOSLEEP_LIB) @LIBINTL@
 +#TESTS += test-fdutimensat
 +#check_PROGRAMS += test-fdutimensat
-+#test_fdutimensat_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) \
-+#  $(LIB_NANOSLEEP) @LIBINTL@
++#test_fdutimensat_LDADD = $(LDADD) $(CLOCK_TIME_LIB) \
++#  $(NANOSLEEP_LIB) @LIBINTL@
  EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-fdutimensat.c macros.h
  
  ## end   gnulib module fdutimensat-tests
@@ -48,10 +48,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-futimens
 -check_PROGRAMS += test-futimens
--test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+-test_futimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
 +#TESTS += test-futimens
 +#check_PROGRAMS += test-futimens
-+#test_futimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
++#test_futimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
  EXTRA_DIST += nap.h test-futimens.h test-utimens-common.h test-futimens.c signature.h macros.h
  
  ## end   gnulib module futimens-tests
@@ -61,10 +61,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-lchown
 -check_PROGRAMS += test-lchown
--test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
+-test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
 +#TESTS += test-lchown
 +#check_PROGRAMS += test-lchown
-+#test_lchown_LDADD = $(LDADD) $(LIB_NANOSLEEP)
++#test_lchown_LDADD = $(LDADD) $(NANOSLEEP_LIB)
  EXTRA_DIST += nap.h test-lchown.h test-lchown.c signature.h macros.h
  
  ## end   gnulib module lchown-tests
@@ -74,10 +74,10 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/gnulib.mk coreutils-8.27/gnulib-tests
  
 -TESTS += test-utimens
 -check_PROGRAMS += test-utimens
--test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
+-test_utimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
 +#TESTS += test-utimens
 +#check_PROGRAMS += test-utimens
-+#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
++#test_utimens_LDADD = $(LDADD) $(CLOCK_TIME_LIB) $(NANOSLEEP_LIB) @LIBINTL@
  EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
  
  ## end   gnulib module utimens-tests
@@ -112,15 +112,15 @@ diff -ruN coreutils-8.27.orig/tests/local.mk coreutils-8.27/tests/local.mk
    tests/rm/cycle.sh                           \
    tests/cp/link-heap.sh                               \
    tests/cp/no-ctx.sh                          \
--  tests/misc/tty-eof.pl                               \
-   tests/tail-2/inotify-hash-abuse.sh          \
-   tests/tail-2/inotify-hash-abuse2.sh         \
-   tests/tail-2/F-vs-missing.sh                        \
+-  tests/tty/tty-eof.pl                                \
+   tests/misc/read-errors.sh                   \
+   tests/misc/write-errors.sh                  \
+   tests/tail/inotify-hash-abuse.sh            \
 @@ -364,7 +363,6 @@
-   tests/misc/sort-unique-segv.sh              \
-   tests/misc/sort-version.sh                  \
-   tests/misc/sort-NaN-infloop.sh              \
--  tests/misc/sort-u-FMR.sh                    \
+   tests/sort/sort-unique-segv.sh              \
+   tests/sort/sort-version.sh                  \
+   tests/sort/sort-NaN-infloop.sh              \
+-  tests/sort/sort-u-FMR.sh                    \
    tests/split/filter.sh                               \
    tests/split/suffix-auto-length.sh           \
    tests/split/suffix-length.sh                        \