@@ -206,28 +206,32 @@ func clearEnv() {
206206
207207func getValidValuesTests (toolToTest string ) []latencyTest {
208208 var testSet []latencyTest
209- testSet = append (testSet , latencyTest {testDelay : "0" , testRun : "true" , testRuntime : "5" , testMaxLatency : guaranteedLatency , testCpus : "2" , outputMsgs : []string {success }, toolToTest : toolToTest })
210- testSet = append (testSet , latencyTest {testDelay : "0" , testRun : "true" , testRuntime : "1" , testMaxLatency : guaranteedLatency , testCpus : "5" , outputMsgs : []string {success }, toolToTest : toolToTest })
211- testSet = append (testSet , latencyTest {testDelay : "1" , testRun : "true" , testRuntime : "2" , testMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
209+
210+ //testRuntime: let runtime be 10 seconds for most of the tests and not less, that is to let the tools
211+ //have their time to measure latency properly hence stabilizing the tests
212+ //testCpus: for tests that expect a success output message, note that an even CPU number is needed, otherwise the test would fail with SMTAlignmentError
213+ testSet = append (testSet , latencyTest {testDelay : "0" , testRun : "true" , testRuntime : "10" , testMaxLatency : guaranteedLatency , testCpus : "2" , outputMsgs : []string {success }, toolToTest : toolToTest })
214+ testSet = append (testSet , latencyTest {testDelay : "0" , testRun : "true" , testRuntime : "10" , testMaxLatency : guaranteedLatency , testCpus : "6" , outputMsgs : []string {success }, toolToTest : toolToTest })
215+ testSet = append (testSet , latencyTest {testDelay : "1" , testRun : "true" , testRuntime : "10" , testMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
212216 testSet = append (testSet , latencyTest {testDelay : "60" , testRun : "true" , testRuntime : "2" , testMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
213217
214218 if toolToTest != hwlatdetect {
215- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , outputMsgs : []string {skip , skipMaxLatency }, toolToTest : toolToTest })
219+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "1 " , outputMsgs : []string {skip , skipMaxLatency }, toolToTest : toolToTest })
216220 }
217221 if toolToTest == oslat {
218- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , testMaxLatency : "1" , oslatMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
219- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , oslatMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
220- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "2 " , testMaxLatency : guaranteedLatency , testCpus : "1" , outputMsgs : []string {skip , skipOslatCpuNumber }, toolToTest : toolToTest })
222+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , testMaxLatency : "1" , oslatMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
223+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , oslatMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
224+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , testMaxLatency : guaranteedLatency , testCpus : "1" , outputMsgs : []string {skip , skipOslatCpuNumber }, toolToTest : toolToTest })
221225 }
222226 if toolToTest == cyclictest {
223- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , testMaxLatency : "1" , cyclictestMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
224- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , cyclictestMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
227+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , testMaxLatency : "1" , cyclictestMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
228+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , cyclictestMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
225229
226230 }
227231 if toolToTest == hwlatdetect {
228- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , testMaxLatency : "1" , hwlatdetectMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
229- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , hwlatdetectMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
230- testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "5 " , outputMsgs : []string {success }, toolToTest : toolToTest })
232+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , testMaxLatency : "1" , hwlatdetectMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
233+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , hwlatdetectMaxLatency : guaranteedLatency , outputMsgs : []string {success }, toolToTest : toolToTest })
234+ testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : "10 " , outputMsgs : []string {success }, toolToTest : toolToTest })
231235 }
232236 return testSet
233237}
@@ -238,7 +242,7 @@ func getNegativeTests(toolToTest string) []latencyTest {
238242 if toolToTest == hwlatdetect {
239243 latencyFailureMsg = hwlatdetectFail
240244 }
241-
245+ //TODO: add test to check odd CPU request.
242246 testSet = append (testSet , latencyTest {testDelay : "0" , testRun : "true" , testRuntime : "5" , testMaxLatency : "1" , outputMsgs : []string {latencyFailureMsg , fail }, toolToTest : toolToTest })
243247 testSet = append (testSet , latencyTest {testRun : "yes" , testRuntime : "5" , testMaxLatency : "1" , outputMsgs : []string {incorrectTestRun , fail }, toolToTest : toolToTest })
244248 testSet = append (testSet , latencyTest {testRun : "true" , testRuntime : fmt .Sprint (math .MaxInt32 + 1 ), outputMsgs : []string {invalidNumberRuntime , fail }, toolToTest : toolToTest })
0 commit comments