From 764948b51f2464156de955c61e72d33b30185cdd Mon Sep 17 00:00:00 2001
From: Ken Sato <ken.sato.ty@hitachi-solutions.com>
Date: Mon, 25 Feb 2019 17:36:46 +0900
Subject: [PATCH] test: Fix test programs for #1195

Add chmod 666 /dev/mcos0 for fork after setuid()

Refs: #1195
Change-Id: I2bec6a9a8378d246f50a9fc08a345b3235096a06
---
 test/issues/1195/C1195.sh   | 3 +++
 test/issues/1195/README     | 7 +++++++
 test/issues/1195/result.log | 6 ------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/issues/1195/C1195.sh b/test/issues/1195/C1195.sh
index 7bc2c3a3..1971c197 100644
--- a/test/issues/1195/C1195.sh
+++ b/test/issues/1195/C1195.sh
@@ -5,6 +5,9 @@ USEOSTEST=0
 
 . ../../common.sh
 
+# for fork after setuid()
+chmod 666 /dev/mcos0
+
 tid=001
 echo "*** CT$tid start *******************************"
 sudo ${MCEXEC} ${LTPBIN}/nftw01 2>&1 | tee ./CT${tid}.txt
diff --git a/test/issues/1195/README b/test/issues/1195/README
index 17529797..f7294b9a 100644
--- a/test/issues/1195/README
+++ b/test/issues/1195/README
@@ -24,3 +24,10 @@ $HOMEにコピーし、適宜編集する
 □ 実行結果
 result.log 参照。
 すべての項目をPASSしていることを確認。
+
+なお、以下のようなメッセージが出力されることがあるが、これは本件とは無
+関係な不具合により、テスト用ディレクトリの削除に失敗するためである。こ
+の失敗はテスト結果に影響を与えないため、無視して構わない。
+
+main_loop: Error: open_exec() fails for /home/centos/project/src/ltp/install/testcases/bin/nftw01: -1 (fd: 3)
+fork(): error with child process after fork
diff --git a/test/issues/1195/result.log b/test/issues/1195/result.log
index 4417816f..22c722af 100644
--- a/test/issues/1195/result.log
+++ b/test/issues/1195/result.log
@@ -1,7 +1,4 @@
 *** CT001 start *******************************
-Error: Failed to open /dev/mcos0.
-ERROR: opening /dev/mcos0
-fork(): error with child process after fork
 nftw01      1  TPASS  :  Test block 0
 nftw01      2  TPASS  :  Test block 1
 nftw01      3  TPASS  :  Test block 2
@@ -36,9 +33,6 @@ nftw01     31  TPASS  :  Test passed
 *** CT001: PASSED (ok:31, ng:0)
 
 *** CT002 start *******************************
-Error: Failed to open /dev/mcos0.
-ERROR: opening /dev/mcos0
-fork(): error with child process after fork
 nftw6401    1  TPASS  :  Test block 0
 nftw6401    2  TPASS  :  Test block 1
 nftw6401    3  TPASS  :  Test block 2