From 3df82d61ce91ffdb28c440f3af5e4552e963bb2d Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Wed, 19 Sep 2018 17:08:11 +0900 Subject: [PATCH] test: Fix tests of "user_space" user_space/swapout/swapout_copy_to_01.sh: * Use ~/.mck_test_config * Fix checking if McKernel version is written in swap-file user_space/futex/futex_test.sh: * Use ~/.mck_test_config user_space/perf_event_open/perf_event_open_test.sh * Use ~/.mck_test_config Change-Id: Id93b207ed0e3e9ebf307073db81b40335bc5b140 --- test/mck_test_config.sample.in | 1 + test/user_space/ReadMe | 12 +++++++++--- test/user_space/futex/config | 2 -- test/user_space/futex/futex_test.sh | 13 ++++--------- test/user_space/perf_event_open/config | 2 -- .../perf_event_open/perf_event_open_test.sh | 13 ++++--------- test/user_space/swapout/swapout_copy_to_01.sh | 6 ++++-- 7 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 test/user_space/futex/config delete mode 100644 test/user_space/perf_event_open/config diff --git a/test/mck_test_config.sample.in b/test/mck_test_config.sample.in index 584fb4e5..dc89d515 100644 --- a/test/mck_test_config.sample.in +++ b/test/mck_test_config.sample.in @@ -4,3 +4,4 @@ : ${OSTEST:=} : ${LTP:=} : ${BOOTPARAM:=-c 1-7,9-15,17-23,25-31 -m 10G@0,10G@1 -r 1-7:0+9-15:8+17-23:16+25-31:24} +: ${MCKERNEL_VERSION:=@MCKERNEL_VERSION@} diff --git a/test/user_space/ReadMe b/test/user_space/ReadMe index 09681c3f..6baed158 100644 --- a/test/user_space/ReadMe +++ b/test/user_space/ReadMe @@ -1,6 +1,12 @@ User spaceテストについて 1.テストの準備 -1.1 パッチファイル +1.1 設定ファイル + +以下のコマンドでシェルスクリプトの変数設定用includeファイルを準備します。 + + cp -i /mckernel/mck_test_config.sample ~/.mck_test_config + +1.2 パッチファイル テストは、修正部分にkprintfをパッチで追加し確認を行います。 パッチファイルは以下のディレクトリに格納しています。 　mckernel/test/user_space/patch/ @@ -18,7 +24,7 @@ User spaceテストについて なし swapout so_023-so_025 qlmpilib.patch swapout so_026 -1.2 パッチの適用 +1.3 パッチの適用 mckernelディレクトリで以下コマンドを実行してパッチを当ててください。 パッチ実行後ビルドしてください。 @@ -26,7 +32,7 @@ User spaceテストについて (XXXX.patchはパッチファイル名) -1.3 その他プログラムのコンパイル +1.4 その他プログラムのコンパイル (1)user_space/swapoutディレクトリで、makeし、swaptest実行モジュールを作成してください。 (2)qlmpi/qlmpi_testsuiteディレクトリで、テスト用プログラムのコンパイルを実施してください。 (3)LTPプログラムの実行モジュールを準備する必要があります。 diff --git a/test/user_space/futex/config b/test/user_space/futex/config deleted file mode 100644 index e5f48348..00000000 --- a/test/user_space/futex/config +++ /dev/null @@ -1,2 +0,0 @@ -MCPATH=/home/iizuka/mckernel -LTP_EXE_DIR=/home/iizuka/LTP/futex diff --git a/test/user_space/futex/futex_test.sh b/test/user_space/futex/futex_test.sh index 2bafa7b8..470cba63 100755 --- a/test/user_space/futex/futex_test.sh +++ b/test/user_space/futex/futex_test.sh @@ -32,7 +32,7 @@ function ng_out() { function ltp_test() { TEST_NAME=$1 #LTP programを実行 logを保存 - sudo ${MCPATH}/bin/mcexec ${LTP_EXE_DIR}/${TEST_NAME} >./result/${TEST_NAME}.log + sudo ${MCK_DIR}/bin/mcexec ${LTP}/testcases/bin/${TEST_NAME} >./result/${TEST_NAME}.log #LTP log 確認 NUM=`cat ./test_cases/${TEST_NAME}.txt |wc -l` @@ -56,21 +56,16 @@ TEST_CODE=001 TEST_PREFIX=futex_ ME=`whoami` -if [ $# -ne 2 ]; then - source ./config -else - MCPATH=$1 - LTP_EXE_DIR=$2/futex -fi +source ${HOME}/.mck_test_config mkdir -p result reboot #LTP programを実行 logを保存 -mcexec ${LTP_EXE_DIR}/futex_wait01 >./result/futex_wait01.log +${MCK_DIR}/bin/mcexec ${LTP}/testcases/bin/futex_wait01 >./result/futex_wait01.log #kmsgを保存 -sudo ${MCPATH}/sbin/ihkosctl 0 kmsg >./result/futex_wait01.kmsg +sudo ${MCK_DIR}/sbin/ihkosctl 0 kmsg >./result/futex_wait01.kmsg #kmsgで結果を出力する。 #futex-001 アドレスが正しく引き継いでいることを確認 diff --git a/test/user_space/perf_event_open/config b/test/user_space/perf_event_open/config deleted file mode 100644 index 7692ff25..00000000 --- a/test/user_space/perf_event_open/config +++ /dev/null @@ -1,2 +0,0 @@ -MCPATH=/home/iizuka/mckernel -LTP_EXE_DIR=/home/iizuka/LTP/perf_event_open diff --git a/test/user_space/perf_event_open/perf_event_open_test.sh b/test/user_space/perf_event_open/perf_event_open_test.sh index f70e73cc..dffff8e7 100755 --- a/test/user_space/perf_event_open/perf_event_open_test.sh +++ b/test/user_space/perf_event_open/perf_event_open_test.sh @@ -32,7 +32,7 @@ function ng_out() { function ltp_test() { TEST_NAME=$1 #LTP programを実行 logを保存 - ${MCPATH}/bin/mcexec ${LTP_EXE_DIR}/${TEST_NAME} >./result/${TEST_NAME}.log + ${MCK_DIR}/bin/mcexec ${LTP}/testcases/bin/${TEST_NAME} >./result/${TEST_NAME}.log #LTP log 確認 NUM=`cat ./test_cases/${TEST_NAME}.txt |wc -l` @@ -55,20 +55,15 @@ TEST_CODE=001 TEST_PREFIX=perf_ ME=`whoami` -if [ $# -ne 2 ]; then - source ./config -else - MCPATH=$1 - LTP_EXE_DIR=$2/perf_event_open -fi +source ${HOME}/.mck_test_config mkdir -p ./result reboot #LTP programを実行 logを保存 -mcexec ${LTP_EXE_DIR}/perf_event_open01 >./result/perf_event_open01.log +${MCK_DIR}/bin/mcexec ${LTP}/testcases/bin/perf_event_open01 >./result/perf_event_open01.log #kmsgを保存 -sudo ${MCPATH}/sbin/ihkosctl 0 kmsg >./result/perf_event_open01.kmsg +sudo ${MCK_DIR}/sbin/ihkosctl 0 kmsg >./result/perf_event_open01.kmsg #kmsgで結果を出力する。 NUM=`cat ./test_cases/perd_event_open01.kmsg.txt |wc -l` diff --git a/test/user_space/swapout/swapout_copy_to_01.sh b/test/user_space/swapout/swapout_copy_to_01.sh index 23419919..52562979 100755 --- a/test/user_space/swapout/swapout_copy_to_01.sh +++ b/test/user_space/swapout/swapout_copy_to_01.sh @@ -1,5 +1,7 @@ #!/bin/sh +. ${HOME}/.mck_test_config + # Functions function reboot() { count=`pgrep -c -f 'mcexec '` @@ -99,8 +101,8 @@ fi #swapout011 do_pageout si->swphdr->version version=`grep "do_pageout:.*,si->swphdr->version" ./result/swapout_copy_to_01.kmsg | head -n 1 | sed s/"^.*copy_to_user .*,si->swphdr->version:\(.*\),si->swphdr->count_sarea:.*$"/"\1"/ ` #echo ${version} -if [ "${version}" = "0.9.0" ]; then - text=`echo "do_pageout:si->swphdr->version is 0.9.0"` +if [ "${version}" = "${MCKERNEL_VERSION}" ]; then + text=`echo "do_pageout:si->swphdr->version is ${MCKERNEL_VERSION}"` ok_out "${text} :(${version})" else ng_out "do_pageout: does not match the value of si->swphdr->version."