diff --git a/test/parallel/Collection/Suite2/RunParallel/TestCase.sh b/test/parallel/Collection/Suite2/Run0/TestCase.sh similarity index 74% rename from test/parallel/Collection/Suite2/RunParallel/TestCase.sh rename to test/parallel/Collection/Suite2/Run0/TestCase.sh index 86293f5..e8c70d8 100644 --- a/test/parallel/Collection/Suite2/RunParallel/TestCase.sh +++ b/test/parallel/Collection/Suite2/Run0/TestCase.sh @@ -1,9 +1,9 @@ -#--variantCount=15 +#--variantCount=14 setVar 'TTRO_stepsCase' 'myStep' declare -a durations=(30 20 22 44 30 60 30 30 33 34 - 55 66 88 11 30) + 55 66 88 11) function myStep { useCpu ${durations[$TTRO_variantCase]} $TTRO_variantCase "false" -} \ No newline at end of file +} diff --git a/test/parallel/Collection/Suite2/RunParallel1/TestCase.sh b/test/parallel/Collection/Suite2/Run1/TestCase.sh similarity index 100% rename from test/parallel/Collection/Suite2/RunParallel1/TestCase.sh rename to test/parallel/Collection/Suite2/Run1/TestCase.sh diff --git a/test/parallel/Collection/Suite2/RunParallel2/TestCase.sh b/test/parallel/Collection/Suite2/Run2/TestCase.sh similarity index 100% rename from test/parallel/Collection/Suite2/RunParallel2/TestCase.sh rename to test/parallel/Collection/Suite2/Run2/TestCase.sh diff --git a/test/parallel/Collection/Suite2/Run3/TestCase.sh b/test/parallel/Collection/Suite2/Run3/TestCase.sh new file mode 100644 index 0000000..b792afc --- /dev/null +++ b/test/parallel/Collection/Suite2/Run3/TestCase.sh @@ -0,0 +1,9 @@ +#--variantCount=1 +#--exclusive=true + +setVar 'TTRO_stepsCase' 'myStep' + +declare -a durations=(15) +function myStep { + useCpu ${durations[$TTRO_variantCase]} $TTRO_variantCase "false" +} diff --git a/test/parallel/Collection/Suite2/Run4/TestCase.sh b/test/parallel/Collection/Suite2/Run4/TestCase.sh new file mode 100644 index 0000000..3ade61e --- /dev/null +++ b/test/parallel/Collection/Suite2/Run4/TestCase.sh @@ -0,0 +1,8 @@ +#--variantCount=1 + +setVar 'TTRO_stepsCase' 'myStep' + +declare -a durations=(22) +function myStep { + useCpu ${durations[$TTRO_variantCase]} $TTRO_variantCase "false" +} diff --git a/test/parallel/Collection/Suite2/Run5/TestCase.sh b/test/parallel/Collection/Suite2/Run5/TestCase.sh new file mode 100644 index 0000000..08dcfe4 --- /dev/null +++ b/test/parallel/Collection/Suite2/Run5/TestCase.sh @@ -0,0 +1,9 @@ +#--variantCount=2 +#--exclusive=true + +setVar 'TTRO_stepsCase' 'myStep' + +declare -a durations=(15 14) +function myStep { + useCpu ${durations[$TTRO_variantCase]} $TTRO_variantCase "false" +} diff --git a/test/parallel/Collection/TestSuite.sh b/test/parallel/Collection/TestSuite.sh index 8425a4b..c5f2f16 100644 --- a/test/parallel/Collection/TestSuite.sh +++ b/test/parallel/Collection/TestSuite.sh @@ -7,6 +7,9 @@ function testPreparation { echo echo "In Suite 1 the cases 7, 11 and 12 should be terminated" echo + echo "In Suite 2 cases 'Run1' (2 variants), 'Run3' (1 variant) and 'Run5' (2 variants)" + echo "must be sequentially executed" + echo promptYesNo echo "$FUNCNAME : Running global test preparation" useCpu 4 1 ""