diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-23 18:34:15 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:38:54 +0000 |
| commit | cd4fc516ce0f8e4c5cadb7a700fe29643ed9128d (patch) | |
| tree | 7819b6dd49232f4251b4e3628fd9240d55359dae | |
| parent | e0e30637a139feb744ca284aa63d47efefc5cb5d (diff) | |
| download | openembedded-core-cd4fc516ce0f8e4c5cadb7a700fe29643ed9128d.tar.gz | |
mdadm: correctly set up testing location for ptests
1. Do not clutter /, create a special-purpose dir
2. Clean up the dir after tests are done (if this is not
performed, disk will overflow later in ptesting).
3. Fix up more locations in ptests to use the dir.
Upstream default /var/tmp is not suitable as it is not
big enough (mdadm needs about 500 Mb)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/mdadm/files/run-ptest | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.1.bb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest index e4a9c2b08b..7959c055ad 100644 --- a/meta/recipes-extended/mdadm/files/run-ptest +++ b/meta/recipes-extended/mdadm/files/run-ptest @@ -1,4 +1,7 @@ #!/bin/sh +mkdir -p /mdadm-testing-dir # make the test continue to execute even one fail ./test --keep-going + +rm -rf /mdadm-testing-dir/* diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb index 64f519e750..40c5273e00 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.1.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb @@ -75,7 +75,8 @@ do_compile_ptest() { do_install_ptest() { cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests cp ${S}/test ${D}${PTEST_PATH} - sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test + sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test + sed -e 's!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/tests/* sed -i -e '/echo -ne "$_script... "/d' \ -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \ -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \ |