144 lines
5.2 KiB
Diff
144 lines
5.2 KiB
Diff
diff -urNp coreutils-8.4-orig/gnulib-tests/gnulib.mk coreutils-8.4/gnulib-tests/gnulib.mk
|
|
--- coreutils-8.4-orig/gnulib-tests/gnulib.mk 2010-01-13 22:01:30.000000000 +0100
|
|
+++ coreutils-8.4/gnulib-tests/gnulib.mk 2010-01-14 10:28:17.000000000 +0100
|
|
@@ -256,9 +256,9 @@ EXTRA_DIST += nap.h test-chown.h test-ch
|
|
|
|
## begin gnulib module cloexec-tests
|
|
|
|
-TESTS += test-cloexec
|
|
-check_PROGRAMS += test-cloexec
|
|
-EXTRA_DIST += test-cloexec.c macros.h
|
|
+#TESTS += test-cloexec
|
|
+#check_PROGRAMS += test-cloexec
|
|
+#EXTRA_DIST += test-cloexec.c macros.h
|
|
|
|
## end gnulib module cloexec-tests
|
|
|
|
@@ -332,9 +332,9 @@ EXTRA_DIST += test-dirname.c
|
|
|
|
## begin gnulib module dup2-tests
|
|
|
|
-TESTS += test-dup2
|
|
-check_PROGRAMS += test-dup2
|
|
-EXTRA_DIST += test-dup2.c signature.h macros.h
|
|
+#TESTS += test-dup2
|
|
+#check_PROGRAMS += test-dup2
|
|
+#EXTRA_DIST += test-dup2.c signature.h macros.h
|
|
|
|
## end gnulib module dup2-tests
|
|
|
|
@@ -376,9 +376,9 @@ EXTRA_DIST += test-exclude.c test-exclud
|
|
|
|
## begin gnulib module fchdir-tests
|
|
|
|
-TESTS += test-fchdir
|
|
-check_PROGRAMS += test-fchdir
|
|
-EXTRA_DIST += test-fchdir.c signature.h macros.h
|
|
+#TESTS += test-fchdir
|
|
+#check_PROGRAMS += test-fchdir
|
|
+#EXTRA_DIST += test-fchdir.c signature.h macros.h
|
|
|
|
## end gnulib module fchdir-tests
|
|
|
|
@@ -855,10 +855,10 @@ EXTRA_DIST += $(top_srcdir)/build-aux/li
|
|
|
|
## begin gnulib module linkat-tests
|
|
|
|
-TESTS += test-linkat
|
|
-check_PROGRAMS += test-linkat
|
|
-test_linkat_LDADD = $(LDADD) @LIBINTL@
|
|
-EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
|
|
+#TESTS += test-linkat
|
|
+#check_PROGRAMS += test-linkat
|
|
+#test_linkat_LDADD = $(LDADD) @LIBINTL@
|
|
+#EXTRA_DIST += test-link.h test-linkat.c signature.h macros.h
|
|
|
|
## end gnulib module linkat-tests
|
|
|
|
@@ -1532,9 +1532,9 @@ EXTRA_DIST += test-uname.c signature.h m
|
|
|
|
## begin gnulib module unistd-safer-tests
|
|
|
|
-TESTS += test-dup-safer
|
|
-check_PROGRAMS += test-dup-safer
|
|
-EXTRA_DIST += test-dup-safer.c macros.h
|
|
+#TESTS += test-dup-safer
|
|
+#check_PROGRAMS += test-dup-safer
|
|
+#EXTRA_DIST += test-dup-safer.c macros.h
|
|
|
|
## end gnulib module unistd-safer-tests
|
|
|
|
@@ -1644,10 +1644,10 @@ EXTRA_DIST += test-usleep.c signature.h
|
|
|
|
## begin gnulib module utimens-tests
|
|
|
|
-TESTS += test-utimens
|
|
-check_PROGRAMS += test-utimens
|
|
-test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @LIBINTL@
|
|
-EXTRA_DIST += nap.h test-futimens.h test-lutimens.h test-utimens.h test-utimens-common.h test-utimens.c macros.h
|
|
+#TESTS += test-utimens
|
|
+#check_PROGRAMS += test-utimens
|
|
+#test_utimens_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) @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 -urNp coreutils-8.4-orig/tests/Makefile.am coreutils-8.4/tests/Makefile.am
|
|
--- coreutils-8.4-orig/tests/Makefile.am 2010-01-03 18:06:20.000000000 +0100
|
|
+++ coreutils-8.4/tests/Makefile.am 2010-01-14 10:28:17.000000000 +0100
|
|
@@ -79,7 +79,6 @@ TESTS = \
|
|
rm/ext3-perf \
|
|
rm/cycle \
|
|
cp/link-heap \
|
|
- tail-2/inotify-hash-abuse \
|
|
tail-2/inotify-hash-abuse2 \
|
|
tail-2/F-vs-missing \
|
|
tail-2/F-vs-rename \
|
|
diff -urNp coreutils-8.4-orig/tests/touch/no-dereference coreutils-8.4/tests/touch/no-dereference
|
|
--- coreutils-8.4-orig/tests/touch/no-dereference 2010-01-12 15:36:17.000000000 +0100
|
|
+++ coreutils-8.4/tests/touch/no-dereference 2010-01-14 10:28:17.000000000 +0100
|
|
@@ -46,6 +46,8 @@ test -f nowhere && fail=1
|
|
grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
|
|
grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
|
|
skip_test_ 'this system lacks the utimensat function'
|
|
+grep '^#define HAVE_WORKINGKOJI 1' "$CONFIG_HEADER" > /dev/null ||
|
|
+ skip_test_ 'rest of the test disabled due to koji lack of utimensat function'
|
|
|
|
# Changing time of dangling symlink is okay.
|
|
# Skip the test if this fails, but the error text corresponds to
|
|
diff -urNp coreutils-8.12-orig/src/Makefile.am coreutils-8.12/src/Makefile.am
|
|
--- coreutils-8.12-orig/src/Makefile.am 2012-11-06 09:26:07.137152887 +0100
|
|
+++ coreutils-8.12/src/Makefile.am 2012-11-06 09:27:02.778884576 +0100
|
|
@@ -139,7 +139,7 @@ bin_PROGRAMS = $(OPTIONAL_BIN_PROGS)
|
|
|
|
noinst_PROGRAMS = setuidgid getlimits
|
|
|
|
-pkglib_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS)
|
|
+pkglibexec_PROGRAMS = $(OPTIONAL_PKGLIB_PROGS)
|
|
|
|
noinst_HEADERS = \
|
|
chown-core.h \
|
|
diff -urNp coreutils-8.12-orig/src/stdbuf.c coreutils-8.12/src/stdbuf.c
|
|
--- coreutils-8.12-orig/src/stdbuf.c 2011-02-19 22:28:53.000000000 +0100
|
|
+++ coreutils-8.12/src/stdbuf.c 2012-11-06 09:28:24.504275850 +0100
|
|
@@ -194,15 +194,14 @@ set_LD_PRELOAD (void)
|
|
char *LD_PRELOAD;
|
|
|
|
/* Note this would auto add the appropriate search path for "libstdbuf.so":
|
|
- gcc stdbuf.c -Wl,-rpath,'$ORIGIN' -Wl,-rpath,$PKGLIBDIR
|
|
+ gcc stdbuf.c -Wl,-rpath,'$ORIGIN' -Wl,-rpath,$PKGLIBEXECDIR
|
|
However we want the lookup done for the exec'd command not stdbuf.
|
|
|
|
- Since we don't link against libstdbuf.so add it to LIBDIR rather than
|
|
- LIBEXECDIR, as we'll search for it in the "sys default" case below. */
|
|
+ Since we don't link against libstdbuf.so add it to PKGLIBEXECDIR
|
|
+ rather than to LIBDIR. */
|
|
char const *const search_path[] = {
|
|
program_path,
|
|
- PKGLIBDIR,
|
|
- "", /* sys default */
|
|
+ PKGLIBEXECDIR,
|
|
NULL
|
|
};
|
|
|