!3 修复root用户make check失败问题

Merge pull request !3 from lubing6/next

fix-testcase-fail-if-noroot.patch

@@ -0,0 +1,212 @@
+From f4cae8a433a3744f6d3a6d895ef06631c0a656ec Mon Sep 17 00:00:00 2001
+From: lubing6 <lubing6@huawei.com>
+Date: Sat, 21 Mar 2020 20:52:01 +0800
+Subject: [PATCH] fix testcase fail if noroot
+
+---
+ tests/arguments.at |  2 ++
+ tests/commands.at  |  5 +++++
+ tests/expr.at      |  1 +
+ tests/lexical.at   |  4 ++++
+ tests/variables.at | 10 ++++++++++
+ 5 files changed, 22 insertions(+)
+
+diff --git a/tests/arguments.at b/tests/arguments.at
+index 562fd83..8cd8673 100755
+--- a/tests/arguments.at
++++ b/tests/arguments.at
+@@ -47,6 +47,7 @@ TCSH_UNTESTED([-f])
+ 
+ 
+ AT_SETUP([-i])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_CHECK([echo 'echo $1' | tcsh -f -q -i foo], ,
+ [[> foo
+@@ -143,6 +144,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([non-option arguments])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([options.csh],
+ [[echo $0
+diff --git a/tests/commands.at b/tests/commands.at
+index cf0fcf0..e0532d3 100755
+--- a/tests/commands.at
++++ b/tests/commands.at
+@@ -267,6 +267,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([dirs])
++AT_SKIP_IF([test `whoami` != 'root' ])
+ 
+ AT_DATA([dirs.csh],
+ [[set current=`/bin/pwd`
+@@ -379,6 +380,7 @@ TCSH_UNTESTED([fg])
+ 
+ 
+ AT_SETUP([filetest])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ touch file1 file2
+ chmod 6777 file1
+@@ -561,6 +563,7 @@ TCSH_UNTESTED([hashstat])
+ 
+ 
+ AT_SETUP([history])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([history.csh],
+ [[: cmd 1
+@@ -776,6 +779,7 @@ TCSH_UNTESTED([jobs])
+ 
+ 
+ AT_SETUP([kill])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ # Nested to ensure consistent output
+ AT_DATA([kill.csh],
+@@ -1201,6 +1205,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([source])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([script.csh],
+ [[set var=$1
+diff --git a/tests/expr.at b/tests/expr.at
+index fa373c8..d9e0a1d 100755
+--- a/tests/expr.at
++++ b/tests/expr.at
+@@ -74,6 +74,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([Primary expressions])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_CHECK([tcsh -f -c 'set parseoctal; exit (010)'], 8)
+ AT_CHECK([tcsh -f -c 'exit (010)'], 10)
+diff --git a/tests/lexical.at b/tests/lexical.at
+index 3dc6024..d1ec788 100755
+--- a/tests/lexical.at
++++ b/tests/lexical.at
+@@ -153,6 +153,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([History basics])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ # Printing prompt only when at end of input is rather nondeterministic...
+ AT_DATA([basic.csh],
+@@ -203,6 +204,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([Event specification])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([positive.csh],
+ [[echo 1
+@@ -345,6 +347,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([Word selection])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([words.csh],
+ [[echo 1 2 3 4 5
+@@ -394,6 +397,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([History modifiers])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([modifiers.csh],
+ [[echo foo bar baz quux /usr/src/sys/sys/malloc.c
+diff --git a/tests/variables.at b/tests/variables.at
+index ffa0da2..ad1f7d9 100755
+--- a/tests/variables.at
++++ b/tests/variables.at
+@@ -355,6 +355,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ ellipsis])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([ellipsis0.csh],
+ [[echo $?ellipsis
+@@ -414,6 +415,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ histchars])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([histchars.csh],
+ [[echo $?histchars
+@@ -437,6 +439,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ histdup])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([histdup.csh],
+ [[echo $?histdup
+@@ -494,6 +497,7 @@ VAR_UNSET([histfile])
+ 
+ 
+ AT_SETUP([$ histlit])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([histlit.csh],
+ [[echo $?histlit
+@@ -560,6 +564,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ history])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([history.csh],
+ [[echo $#history $history
+@@ -606,6 +611,7 @@ VAR_UNSET([ignoreeof])
+ 
+ 
+ AT_SETUP([$ implicitcd])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([implicitcd.csh],
+ [[echo $?implicitcd
+@@ -798,6 +804,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ prompt])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([prompt.csh],
+ [[echo "$prompt"
+@@ -834,6 +841,7 @@ AT_CHECK([echo 'echo "$prompt3"' | tcsh -f], ,
+ AT_CLEANUP
+ 
+ AT_SETUP([$ promptchars])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([promptchars.csh],
+ [[echo $?promptchars
+@@ -855,6 +863,7 @@ VAR_UNSET([rmstar])
+ 
+ 
+ AT_SETUP([$ rprompt])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_DATA([rprompt.csh],
+ [[echo $?rprompt
+@@ -1050,6 +1059,7 @@ AT_CLEANUP
+ 
+ 
+ AT_SETUP([$ verbose])
++AT_SKIP_IF([test `whoami` == 'root' ])
+ 
+ AT_CHECK([tcsh -f -v -c 'echo $verbose'], , [
+ ],
+-- 
+1.8.3.1
+

tcsh.spec

@@ -1,6 +1,6 @@
 Name:             tcsh
 Version:          6.21.00
-Release:          4
+Release:          5
 Summary:          C shell with file name completion and command line editing
 License:          BSD
 URL:              http://www.tcsh.org/
@@ -12,8 +12,9 @@ Requires(postun): sed
 Provides:         /bin/csh /bin/tcsh
 Provides:         csh = %{version}
 
-Patch6000: 0061-PR-81-oldping-Fix-range-matching-issue-where-we-were.patch
+Patch0: 0061-PR-81-oldping-Fix-range-matching-issue-where-we-were.patch
-Patch6001: 0063-PR-88-sharifib-Preserve-empty-arguments-in-arrays-as.patch
+Patch1: 0063-PR-88-sharifib-Preserve-empty-arguments-in-arrays-as.patch
+Patch2: fix-testcase-fail-if-noroot.patch
 
 %description
 Tcsh is an enhanced but completely compatible version of the Berkeley
@@ -53,6 +54,9 @@ for lang in $(ls $localedir); do
     fi
 done > %{name}.lang
 
+%check
+%make_build check
+
 %pre
 
 %preun
@@ -92,6 +96,12 @@ fi
 
 
 %changelog
+* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.21.00-5
+- Type: enhancement
+- ID: NA
+- SUG: NA
+- DESC: fix testcase fail if noroot
+
 * Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 6.21.00-4
 - Type: enhancement
 - ID: NA