make id-context test executable, few diagnostics added temporarily to
failing no-create-missing touch test
This commit is contained in:
parent
4ff137bab6
commit
25defc901f
@ -1,3 +1,15 @@
|
|||||||
|
diff -urNp coreutils-6.11-orig/tests/touch/no-create-missing coreutils-6.11/tests/touch/no-create-missing
|
||||||
|
--- coreutils-6.11-orig/tests/touch/no-create-missing 2008-04-19 23:34:23.000000000 +0200
|
||||||
|
+++ coreutils-6.11/tests/touch/no-create-missing 2008-04-24 12:34:52.000000000 +0200
|
||||||
|
@@ -36,7 +36,7 @@ test="$abs_top_builddir/src/test"
|
||||||
|
# This test is ineffective unless /dev/stdout also works.
|
||||||
|
if "$test" -w /dev/stdout >/dev/null &&
|
||||||
|
"$test" ! -w /dev/stdout >&-; then
|
||||||
|
- touch -c - >&- 2> /dev/null || fail=1
|
||||||
|
+ strace touch -c - >&- || fail=1
|
||||||
|
touch -cm - >&- 2> /dev/null || fail=1
|
||||||
|
touch -ca - >&- 2> /dev/null || fail=1
|
||||||
|
fi
|
||||||
diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
|
diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/selinux
|
||||||
--- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200
|
--- coreutils-6.11-orig/tests/mkdir/selinux 2008-04-19 23:34:23.000000000 +0200
|
||||||
+++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200
|
+++ coreutils-6.11/tests/mkdir/selinux 2008-04-22 13:23:50.000000000 +0200
|
||||||
@ -9,20 +21,20 @@ diff -urNp coreutils-6.11-orig/tests/mkdir/selinux coreutils-6.11/tests/mkdir/se
|
|||||||
|
|
||||||
c=invalid-selinux-context
|
c=invalid-selinux-context
|
||||||
msg="failed to set default file creation context to \`$c':"
|
msg="failed to set default file creation context to \`$c':"
|
||||||
diff -urNp coreutils-6.11-orig/tests/misc/runcon-no-reorder coreutils-6.11/tests/misc/runcon-no-reorder
|
diff -urNp coreutils-6.11-orig/tests/test-lib.sh coreutils-6.11/tests/test-lib.sh
|
||||||
--- coreutils-6.11-orig/tests/misc/runcon-no-reorder 2008-04-19 23:34:23.000000000 +0200
|
--- coreutils-6.11-orig/tests/test-lib.sh 2008-04-19 23:34:23.000000000 +0200
|
||||||
+++ coreutils-6.11/tests/misc/runcon-no-reorder 2008-04-22 12:27:42.000000000 +0200
|
+++ coreutils-6.11/tests/test-lib.sh 2008-04-24 14:18:59.000000000 +0200
|
||||||
@@ -34,8 +34,8 @@ fail=0
|
@@ -97,8 +97,8 @@ skip_if_()
|
||||||
# On such a system it fails with the above diagnostic, which is fine.
|
|
||||||
# Before the no-reorder change, it would have failed with a diagnostic
|
|
||||||
# about -j being an invalid option.
|
|
||||||
-runcon $(id -Z) true -j 2> out && : > exp
|
|
||||||
+#runcon $(id -Z) true -j 2> out && : > exp
|
|
||||||
|
|
||||||
-compare out exp || fail=1
|
require_selinux_()
|
||||||
+#compare out exp || fail=1
|
{
|
||||||
|
- case `ls -Zd .` in
|
||||||
(exit $fail); exit $fail
|
- '? .'|'unlabeled .')
|
||||||
|
+ case `ls --scontext -d . | cut -f1 -d" "` in
|
||||||
|
+ '?'|'unlabeled')
|
||||||
|
skip_test_ "this system (or maybe just" \
|
||||||
|
"the current file system) lacks SELinux support"
|
||||||
|
;;
|
||||||
diff -urp coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
diff -urp coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
||||||
--- coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c
|
--- coreutils-6.11-orig/gnulib-tests/test-getaddrinfo.c
|
||||||
+++ coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
+++ coreutils-6.11/gnulib-tests/test-getaddrinfo.c
|
||||||
|
@ -58,6 +58,7 @@ BuildRequires: gettext bison
|
|||||||
BuildRequires: texinfo >= 4.3
|
BuildRequires: texinfo >= 4.3
|
||||||
BuildRequires: lzma
|
BuildRequires: lzma
|
||||||
BuildRequires: autoconf >= 2.58
|
BuildRequires: autoconf >= 2.58
|
||||||
|
BuildRequires: strace
|
||||||
#dist-lzma required
|
#dist-lzma required
|
||||||
BuildRequires: automake >= 1.10.1
|
BuildRequires: automake >= 1.10.1
|
||||||
%{?!nopam:BuildRequires: pam-devel}
|
%{?!nopam:BuildRequires: pam-devel}
|
||||||
@ -130,6 +131,7 @@ cd %name-%version
|
|||||||
%patch951 -p1 -b .selinuxman
|
%patch951 -p1 -b .selinuxman
|
||||||
|
|
||||||
chmod a+x tests/sort/sort-mb-tests
|
chmod a+x tests/sort/sort-mb-tests
|
||||||
|
chmod a+x tests/misc/id-context
|
||||||
|
|
||||||
#fix typos/mistakes in localized documentation(#439410, #440056)
|
#fix typos/mistakes in localized documentation(#439410, #440056)
|
||||||
for pofile in $(find ./po/*.p*)
|
for pofile in $(find ./po/*.p*)
|
||||||
|
Loading…
Reference in New Issue
Block a user