@@ -13,9 +13,10 @@ case $TEST_SUITE in
13
13
14
14
test_set_list=$( find testsuite/* -maxdepth 1 -mindepth 1 -type d | sort)
15
15
test_set_count=$( printf " $test_set_list " | wc -l)
16
- test_set_size[1]=$( printf " %.0f" $( echo " $test_set_count *0.15" | bc) )
17
- test_set_size[2]=$( printf " %.0f" $( echo " $test_set_count *0.3" | bc) )
18
- test_set_size[3]=$( printf " %.0f" $( echo " $test_set_count *0.55" | bc) )
16
+ test_set_size[1]=$( printf " %.0f" $( echo " $test_set_count *0.12" | bc) )
17
+ test_set_size[2]=$( printf " %.0f" $( echo " $test_set_count *0.15" | bc) )
18
+ test_set_size[3]=$(( test_set_count- test_set_size[1 ]- test_set_size[2 ])) # 73%
19
+ echo " Total = ${test_set_count} ; Batch #1 = ${test_set_size[1]} ; Batch #2 = ${test_set_size[2]} ; Batch #3 = ${test_set_size[3]} ;" ;
19
20
20
21
echo " ==> preparing integration testsuite on index $INTEGRATION_INDEX with set size of ${test_set_size[$INTEGRATION_INDEX]} "
21
22
cp phpunit.xml.dist phpunit.xml
@@ -27,20 +28,23 @@ case $TEST_SUITE in
27
28
fi
28
29
29
30
# divide test sets up by indexed testsuites
30
- i=0; j=1
31
+ i=0; j=1; dirIndex=1 ; testIndex=1 ;
31
32
for test_set in $test_set_list ; do
32
33
test_xml[j]+=" <directory suffix=\" Test.php\" >$test_set </directory>\n"
33
34
34
35
if [[ $j -eq $INTEGRATION_INDEX ]]; then
35
- echo " + including $test_set "
36
+ echo " $dirIndex : Batch # $j ( $testIndex of ${test_set_size[$j]} ): + including $test_set "
36
37
else
37
- echo " - excluding $test_set "
38
+ echo " $dirIndex : Batch # $j ( $testIndex of ${test_set_size[$j]} ): + excluding $test_set "
38
39
fi
39
40
41
+ testIndex=$(( testIndex+ 1 ))
42
+ dirIndex=$(( dirIndex+ 1 ))
40
43
i=$(( i+ 1 ))
41
44
if [ $i -eq ${test_set_size[$j]} ] && [ $j -lt $INTEGRATION_SETS ]; then
42
45
j=$(( j+ 1 ))
43
46
i=0
47
+ testIndex=1
44
48
fi
45
49
done
46
50
0 commit comments