Index: ql/src/test/results/clientpositive/semicolon.q.out =================================================================== --- ql/src/test/results/clientpositive/semicolon.q.out (revision 0) +++ ql/src/test/results/clientpositive/semicolon.q.out (revision 0) @@ -0,0 +1,15 @@ +PREHOOK: query: -- comment +-- comment; +-- comment +SELECT COUNT(1) FROM src +PREHOOK: type: QUERY +PREHOOK: Input: default@src +#### A masked pattern was here #### +POSTHOOK: query: -- comment +-- comment; +-- comment +SELECT COUNT(1) FROM src +POSTHOOK: type: QUERY +POSTHOOK: Input: default@src +#### A masked pattern was here #### +500 Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 1459151) +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy) @@ -776,7 +776,18 @@ } public int executeClient(String tname) { - return cliDriver.processLine(qMap.get(tname)); + String commands = qMap.get(tname); + StringBuilder newCommands = new StringBuilder(commands.length()); + int lastMatchEnd = 0; + Matcher commentMatcher = Pattern.compile("^--.*$", Pattern.MULTILINE).matcher(commands); + while (commentMatcher.find()) { + newCommands.append(commands.substring(lastMatchEnd, commentMatcher.start())); + newCommands.append(commentMatcher.group().replaceAll("(?