do not combine control files with retries when running a test suite

The previous behavior of when running a suite
consisting of only client or only server side tests, was to combine all
the control files for the suite's tests into one control file. This
reduces overhead, and makes the suite faster.

However, for tests in a suite that make use of the new test retries
feature using the RETRIES attribute, combining the control files into
one breaks the retries feature.

This CL causes to only combine a suite's control
files which have files with 0 or unspecified retries, and run all tests
that use retries separately.


TEST=Run --remove=<dut> suite:dummyclientretries
See info output that two files are being combined for efficiency, and
two files with retires are being run separately. See that this is indeed
the case when the tests run.

Change-Id: I80010c713451e6224cb8e74f1812a2c0fdccb361
Tested-by: Aviv Keshet <>
Reviewed-by: Chris Sosa <>
Commit-Queue: Aviv Keshet <>
1 file changed