X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=tests.patch;h=fff60284e1efa200b8aa0e513e951a461583e17a;hb=e804a1edb9dcd75e9f4f8f5abe5d4fe3ce254fed;hp=c520626a4c31fd2a054f5bfdb60c60d73a4f04be;hpb=810086a4d87a03c187ad480cb94c00841779425e;p=packages%2Fcoreutils.git

diff --git a/tests.patch b/tests.patch
index c520626..fff6028 100644
--- 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,21 +74,21 @@ 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
 diff -ruN coreutils-8.27.orig/gnulib-tests/test-stat-time.c coreutils-8.27/gnulib-tests/test-stat-time.c
 --- coreutils-8.27.orig/gnulib-tests/test-stat-time.c	2017-01-01 23:35:38.000000000 +0100
 +++ coreutils-8.27/gnulib-tests/test-stat-time.c	2017-06-10 20:43:44.599627263 +0200
-@@ -145,7 +145,7 @@
+@@ -167,7 +167,7 @@ test_mtime (const struct stat *statinfo,
      }
  }
  
--#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+-#if defined _WIN32 && !defined __CYGWIN__
 +#if 1
  /* Skip the ctime tests on native Windows platforms, because their
     st_ctime is either the same as st_mtime (plus or minus an offset)
@@ -96,15 +96,15 @@ diff -ruN coreutils-8.27.orig/gnulib-tests/test-stat-time.c coreutils-8.27/gnuli
 diff -ruN coreutils-8.27.orig/gnulib-tests/test-utimens-common.h coreutils-8.27/gnulib-tests/test-utimens-common.h
 --- coreutils-8.27.orig/gnulib-tests/test-utimens-common.h	2017-01-01 23:35:38.000000000 +0100
 +++ coreutils-8.27/gnulib-tests/test-utimens-common.h	2017-06-10 20:43:44.598627265 +0200
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@ enum {
                            : 0)
  };
  
--# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+-# if defined _WIN32 && !defined __CYGWIN__
 +# if 1
  /* Skip ctime tests on native Windows, since it is either a copy of
     mtime or birth time (depending on the file system), rather than a
-    properly tracked change time.  */
+    properly tracked change time.  See
 diff -ruN coreutils-8.27.orig/tests/local.mk coreutils-8.27/tests/local.mk
 --- coreutils-8.27.orig/tests/local.mk	2017-03-01 05:25:37.000000000 +0100
 +++ coreutils-8.27/tests/local.mk	2017-06-10 20:43:44.601627257 +0200
@@ -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			\