blob: 9ac2461ab69c1db92d9e8322ebf63c1158b682aa [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From d1cd4c31ea0ed7406a3ad4bdaa211f581063f655 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -05003Date: Tue, 15 Aug 2017 10:21:21 +0800
4Subject: [PATCH 2/2] fix run-execscript/run-test/ failed
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005
6FAIL: run-execscript:
7the test suite should not be run as root
8
9FAIL: run-test
10the test suite should not be run as root
11
12Upstream-Status: Pending
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
Brad Bishopd7bf8c12018-02-25 22:55:05 -050016 tests/run-execscript | 3 ++-
17 tests/run-test | 3 ++-
18 2 files changed, 4 insertions(+), 2 deletions(-)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050019
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050020diff --git a/tests/run-execscript b/tests/run-execscript
Brad Bishopd7bf8c12018-02-25 22:55:05 -050021index de78644..38397c1 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050022--- a/tests/run-execscript
23+++ b/tests/run-execscript
24@@ -5,5 +5,6 @@ echo "warning: \`/tmp/bash-notthere' not being found or \`/' being a directory"
25 echo "warning: produce diff output, please do not consider this a test failure" >&2
26 echo "warning: if diff output differing only in the location of the bash" >&2
27 echo "warning: binary appears, please do not consider this a test failure" >&2
Brad Bishopd7bf8c12018-02-25 22:55:05 -050028-${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1
29+rm -f ${BASH_TSTOUT}
30+su -c "${THIS_SH} ./execscript > ${BASH_TSTOUT} 2>&1" test
31 diff ${BASH_TSTOUT} exec.right && rm -f ${BASH_TSTOUT}
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050032diff --git a/tests/run-test b/tests/run-test
Brad Bishopd7bf8c12018-02-25 22:55:05 -050033index d68791c..d6317d2 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050034--- a/tests/run-test
35+++ b/tests/run-test
36@@ -1,4 +1,5 @@
37 unset GROUPS UID 2>/dev/null
38
Brad Bishopd7bf8c12018-02-25 22:55:05 -050039-${THIS_SH} ./test.tests >${BASH_TSTOUT} 2>&1
40+rm -f ${BASH_TSTOUT}
41+su -c "${THIS_SH} ./test.tests > ${BASH_TSTOUT} 2>&1" test
42 diff ${BASH_TSTOUT} test.right && rm -f ${BASH_TSTOUT}
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050043--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500441.8.3.1
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050045