Merge branch 'MDL-42151_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE

admin/tool/generator/classes/testplan_backend.php

@@ -155,6 +155,7 @@ class tool_generator_testplan_backend extends tool_generator_backend {
         }
 
         $replacements = array(
+            $CFG->version,
             self::$users[$size],
             self::$loops[$size],
             self::$rampups[$size],
@@ -169,6 +170,7 @@ class tool_generator_testplan_backend extends tool_generator_backend {
         );
 
         $placeholders = array(
+            '{{MOODLEVERSION_PLACEHOLDER}}',
             '{{USERS_PLACEHOLDER}}',
             '{{LOOPS_PLACEHOLDER}}',
             '{{RAMPUP_PLACEHOLDER}}',

admin/tool/generator/testplan.template.jmx

@@ -12,6 +12,11 @@
             <stringProp name="Argument.value">${__time()}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
+          <elementProp name="moodleversion" elementType="Argument">
+            <stringProp name="Argument.name">moodleversion</stringProp>
+            <stringProp name="Argument.value">{{MOODLEVERSION_PLACEHOLDER}}</stringProp>
+            <stringProp name="Argument.metadata">=</stringProp>
+          </elementProp>
           <elementProp name="size" elementType="Argument">
             <stringProp name="Argument.name">size</stringProp>
             <stringProp name="Argument.value">{{SIZE_PLACEHOLDER}}</stringProp>