fix a issue about more than one comments block in script

demo/sample/1_simple.php

@@ -12,7 +12,7 @@ step3 >> expect 3
 
 */
 
-checkStep1() || print("expect 0\n");
+checkStep1() || print("expect 1\n");
 checkStep3() || print("expect 3\n");
 
 function checkStep1(){}

demo/sample/8_extract_desc.php

+#!/usr/bin/env php
 <?php
 
 /**
@@ -28,24 +29,37 @@ expect 3.2
 
 
 /* group: group1 */
-run() && out() && expect();  // Step: 1.1    >> expect 1.1
-run() && out() && expect();  // Step: 1.2    >> expect 1.2
-run() && out() && expect();  // Step: 1.3    >> expect 1.3  ]]
+// Step: 1.1    >> expect 1.1
+// Step: 1.2    >> expect 1.2
+// Step: 1.3    >> expect 1.3  ]]
 
 /* group: group2 */
-run() && out() && expect();  // Step: 2.1    >> expect 2.1
-run() && out() && expect();  // Step: 2.2    >> expect 2.2
-run() && out() && expect();  // Step: 2.3    >> expect 2.3  ]]
+// Step: 2.1    >> expect 2.1
+// Step: 2.2    >> expect 2.2
+// Step: 2.3    >> expect 2.3  ]]
 
 /**
 step: multi line expect >>
 expect 3.1
 expect 3.2
 >>
-
- *
- *
  */
-run() && out() && expect();
-run() && out() && expect(); // step: 4 >> expect 4
-run() && out() && expect(); // step: 5 >> expect 5
+
+// step: 4 >> expect 4
+// step: 5 >> expect 5
+
+print("expect 1.1\n");
+print("expect 1.2\n");
+print("expect 1.3\n");
+
+print("expect 2.1\n");
+print("expect 2.2\n");
+print("expect 2.3\n");
+
+print(">>\n");
+print("expect 3.1\n");
+print("expect 3.2\n");
+print("<<\n");
+
+print("expect 4\n");
+print("expect 5\n");

src/utils/script/script.go

@@ -439,6 +439,9 @@ func getSortedTextFromNestedSteps(groups []model.TestStep) (ret string, stepMap,
 		stepMap.Put(numbStr, stepTxt)
 
 		expectTxt := strings.TrimSpace(group.Expect)
+		expectTxt = strings.TrimRight(expectTxt, "]]")
+		expectTxt = strings.TrimSpace(expectTxt)
+
 		expectMap.Put(numbStr, expectTxt)
 
 		if expectTxt != "" {

src/utils/zentao/zentao.go

@@ -334,7 +334,7 @@ func ReadCaseInfo(content, lang string, isOldFormat bool) (info, checkpoints str
 	if isOldFormat {
 		regStr = `(?s)\[case\]((?U:.*pid.*))\n(.*)\[esac\]`
 	} else {
-		regStr = fmt.Sprintf(`(?sm)%s((?U:.*pid.*))\n(.*)%s`,
+		regStr = fmt.Sprintf(`(?smU)%s((?U:.*pid.*))\n(.*)%s`,
 			constant.LangCommentsRegxMap[lang][0], constant.LangCommentsRegxMap[lang][1])
 	}
 	myExp := regexp.MustCompile(regStr)