RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 19:17:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16773 from dmick/wip-make-check-cleanup

Browse Source 
Clean up make check for persistent test nodes (like arm64)

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-08-03 08:19:48 -05:00 committed by GitHub
commit 029314954e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
run-make-check.sh
View File

@ -71,6 +71,8 @@ function run() {
$DRY_RUN ./do_cmake.sh $@ || return 1
$DRY_RUN cd build
$DRY_RUN make $BUILD_MAKEOPTS tests || return 1
# prevent OSD EMFILE death on tests
$DRY_RUN sudo ulimit -n 32768
if ! $DRY_RUN ctest $CHECK_MAKEOPTS --output-on-failure; then
rm -f ${TMPDIR:-/tmp}/ceph-asok.*
return 1

12
src/test/encoding/readable.sh
View File

@ -29,8 +29,8 @@ test_object() {
local failed=0
local numtests=0
tmp1=`mktemp /tmp/typ-XXXXXXXXX`
tmp2=`mktemp /tmp/typ-XXXXXXXXX`
tmp1=`mktemp /tmp/test_object_1-XXXXXXXXX`
tmp2=`mktemp /tmp/test_object_2-XXXXXXXXX`
rm -f $output_file
if $CEPH_DENCODER type $type 2>/dev/null; then
@ -62,6 +62,7 @@ test_object() {
fi
if [ "$iv" = "$version" ]; then
rm -rf $tmp1 $tmp2
break
fi
done
@ -69,6 +70,7 @@ test_object() {
if [ -n "$incompat" ]; then
if [ -z "$incompat_paths" ]; then
echo "skipping incompat $type version $arversion, changed at $incompat < code $myversion"
rm -rf $tmp1 $tmp2
return
else
# If we are ignoring not whole type, but objects that are in $incompat_path,
@ -132,14 +134,15 @@ test_object() {
failed=$(($failed + 1))
fi
numtests=$(($numtests + 1))
rm -f $tmp1 $tmp2
done
else
echo "skipping unrecognized type $type"
rm -f $tmp1 $tmp2
fi
echo "failed=$failed" > $output_file
echo "numtests=$numtests" >> $output_file
rm -f $tmp1 $tmp2
}
waitall() { # PID...
@ -197,7 +200,7 @@ else
max_parallel_jobs=${MAX_PARALLEL_JOBS:-$(nproc)}
fi
output_file=`mktemp /tmp/typ-XXXXXXXXX`
output_file=`mktemp /tmp/output_file-XXXXXXXXX`
running_jobs=0
for arversion in `ls $dir/archive | sort -n`; do
@ -219,6 +222,7 @@ for arversion in `ls $dir/archive | sort -n`; do
if [ "$running_jobs" -eq "$max_parallel_jobs" ]; then
do_join
fi
rm -f ${output_file}*
done
done