4c4be9e
diff -urNp coreutils-8.21-orig/gnulib-tests/gnulib.mk coreutils-8.21/gnulib-tests/gnulib.mk
4c4be9e
--- coreutils-8.21-orig/gnulib-tests/gnulib.mk	2013-02-07 17:58:44.000000000 +0100
4c4be9e
+++ coreutils-8.21/gnulib-tests/gnulib.mk	2013-02-15 10:12:28.110593165 +0100
4c4be9e
@@ -267,9 +267,9 @@ EXTRA_DIST += nap.h test-chown.h test-ch
422af9d
 
422af9d
 ## begin gnulib module cloexec-tests
422af9d
 
422af9d
-TESTS += test-cloexec
422af9d
-check_PROGRAMS += test-cloexec
dc24bf6
-EXTRA_DIST += test-cloexec.c macros.h
422af9d
+#TESTS += test-cloexec
422af9d
+#check_PROGRAMS += test-cloexec
dc24bf6
+#EXTRA_DIST += test-cloexec.c macros.h
422af9d
 
422af9d
 ## end   gnulib module cloexec-tests
422af9d
 
4c4be9e
@@ -378,9 +378,9 @@ EXTRA_DIST += test-dup.c signature.h mac
422af9d
 
422af9d
 ## begin gnulib module dup2-tests
422af9d
 
422af9d
-TESTS += test-dup2
422af9d
-check_PROGRAMS += test-dup2
dc24bf6
-EXTRA_DIST += test-dup2.c signature.h macros.h
422af9d
+#TESTS += test-dup2
422af9d
+#check_PROGRAMS += test-dup2
dc24bf6
+#EXTRA_DIST += test-dup2.c signature.h macros.h
422af9d
 
422af9d
 ## end   gnulib module dup2-tests
422af9d
 
4c4be9e
@@ -439,10 +439,10 @@ EXTRA_DIST += test-fadvise.c
422af9d
 
422af9d
 ## begin gnulib module fchdir-tests
422af9d
 
422af9d
-TESTS += test-fchdir
422af9d
-check_PROGRAMS += test-fchdir
59d9061
-test_fchdir_LDADD = $(LDADD) $(LIBINTL)
dc24bf6
-EXTRA_DIST += test-fchdir.c signature.h macros.h
422af9d
+#TESTS += test-fchdir
422af9d
+#check_PROGRAMS += test-fchdir
59d9061
+#test_fchdir_LDADD = $(LDADD) $(LIBINTL)
dc24bf6
+#EXTRA_DIST += test-fchdir.c signature.h macros.h
422af9d
 
422af9d
 ## end   gnulib module fchdir-tests
422af9d
 
5580b50
@@ -874,9 +874,9 @@ EXTRA_DIST += test-getloadavg.c signatur
5580b50
 
5580b50
 ## begin gnulib module getlogin-tests
5580b50
 
5580b50
-TESTS += test-getlogin
5580b50
-check_PROGRAMS += test-getlogin
5580b50
-EXTRA_DIST += test-getlogin.c signature.h macros.h
5580b50
+#TESTS += test-getlogin
5580b50
+#check_PROGRAMS += test-getlogin
5580b50
+#EXTRA_DIST += test-getlogin.c signature.h macros.h
5580b50
 
5580b50
 ## end   gnulib module getlogin-tests
edc2e6a
 
4c4be9e
@@ -1119,10 +1119,10 @@ EXTRA_DIST += test-link.h test-link.c si
c6e08c0
 
c6e08c0
 ## begin gnulib module linkat-tests
c6e08c0
 
c6e08c0
-TESTS += test-linkat
c6e08c0
-check_PROGRAMS += test-linkat
c6e08c0
-test_linkat_LDADD = $(LDADD) @LIBINTL@
c6e08c0
-EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
c6e08c0
+#TESTS += test-linkat
c6e08c0
+#check_PROGRAMS += test-linkat
c6e08c0
+#test_linkat_LDADD = $(LDADD) @LIBINTL@
c6e08c0
+#EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
c6e08c0
 
c6e08c0
 ## end   gnulib module linkat-tests
c6e08c0
 
4c4be9e
@@ -1331,9 +1331,9 @@ EXTRA_DIST += test-memcoll.c macros.h
240f408
 
240f408
 ## begin gnulib module memrchr-tests
240f408
 
cdb1602
-TESTS += test-memrchr
cdb1602
-check_PROGRAMS += test-memrchr
cdb1602
-EXTRA_DIST += test-memrchr.c zerosize-ptr.h signature.h macros.h
cdb1602
+#TESTS += test-memrchr
cdb1602
+#check_PROGRAMS += test-memrchr
cdb1602
+#EXTRA_DIST += test-memrchr.c zerosize-ptr.h signature.h macros.h
240f408
 
240f408
 ## end   gnulib module memrchr-tests
240f408
 
4c4be9e
@@ -1978,9 +1978,9 @@ EXTRA_DIST += test-statat.c
29106ac
 
29106ac
 ## begin gnulib module stdalign-tests
29106ac
 
29106ac
-TESTS += test-stdalign
29106ac
-check_PROGRAMS += test-stdalign
29106ac
-EXTRA_DIST += test-stdalign.c macros.h
29106ac
+#TESTS += test-stdalign
29106ac
+#check_PROGRAMS += test-stdalign
29106ac
+#EXTRA_DIST += test-stdalign.c macros.h
29106ac
 
29106ac
 ## end   gnulib module stdalign-tests
29106ac
 
4c4be9e
@@ -2323,9 +2323,9 @@ EXTRA_DIST += test-uname.c signature.h m
422af9d
 
422af9d
 ## begin gnulib module unistd-safer-tests
422af9d
 
422af9d
-TESTS += test-dup-safer
422af9d
-check_PROGRAMS += test-dup-safer
dc24bf6
-EXTRA_DIST += test-dup-safer.c macros.h
422af9d
+#TESTS += test-dup-safer
422af9d
+#check_PROGRAMS += test-dup-safer
dc24bf6
+#EXTRA_DIST += test-dup-safer.c macros.h
422af9d
 
422af9d
 ## end   gnulib module unistd-safer-tests
422af9d
 
4c4be9e
@@ -2438,10 +2438,10 @@ EXTRA_DIST += test-usleep.c signature.h 
182b088
 
182b088
 ## begin gnulib module utimens-tests
182b088
 
182b088
-TESTS += test-utimens
182b088
-check_PROGRAMS += test-utimens
bb33bc4
-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
182b088
-EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
182b088
+#TESTS += test-utimens
182b088
+#check_PROGRAMS += test-utimens
bb33bc4
+#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_NANOSLEEP) @LIBINTL@
182b088
+#EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
182b088
 
182b088
 ## end   gnulib module utimens-tests
182b088
 
4c4be9e
diff -urNp coreutils-8.21-orig/tests/local.mk coreutils-8.21/tests/local.mk
4c4be9e
--- coreutils-8.21-orig/tests/local.mk	2013-02-11 11:30:12.000000000 +0100
4c4be9e
+++ coreutils-8.21/tests/local.mk	2013-02-15 10:10:55.890532258 +0100
4c4be9e
@@ -131,6 +131,7 @@ all_root_tests =				\
c9e9ece
   tests/rm/no-give-up.sh			\
c9e9ece
   tests/rm/one-file-system.sh			\
c9e9ece
   tests/rm/read-only.sh				\
c9e9ece
+  tests/tail-2/inotify-hash-abuse.sh		\
c9e9ece
   tests/tail-2/append-only.sh			\
c9e9ece
   tests/touch/now-owned-by-other.sh
c9e9ece
 
4c4be9e
@@ -163,7 +164,6 @@ all_tests =					\
c9e9ece
   tests/rm/cycle.sh				\
c9e9ece
   tests/cp/link-heap.sh				\
c9e9ece
   tests/misc/tty-eof.pl				\
c9e9ece
-  tests/tail-2/inotify-hash-abuse.sh		\
c9e9ece
   tests/tail-2/inotify-hash-abuse2.sh		\
c9e9ece
   tests/tail-2/F-vs-missing.sh			\
c9e9ece
   tests/tail-2/F-vs-rename.sh			\
4c4be9e
diff -urNp coreutils-8.21-orig/tests/touch/no-dereference.sh coreutils-8.21/tests/touch/no-dereference.sh
4c4be9e
--- coreutils-8.21-orig/tests/touch/no-dereference.sh	2013-01-31 01:46:25.000000000 +0100
4c4be9e
+++ coreutils-8.21/tests/touch/no-dereference.sh	2013-02-15 10:10:55.889593383 +0100
4c4be9e
@@ -42,6 +42,8 @@ test -f nowhere && fail=1
4c4be9e
 grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
4c4be9e
 grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
4c4be9e
   skip_ 'this system lacks the utimensat function'
4c4be9e
+grep '^#define HAVE_WORKINGKOJI 1' "$CONFIG_HEADER" > /dev/null ||
4c4be9e
+  skip_ 'rest of the test disabled due to koji lack of utimensat function'
4c4be9e
 
4c4be9e
 # Changing time of dangling symlink is okay.
4c4be9e
 # Skip the test if this fails, but the error text corresponds to