This is an automated email from the ASF dual-hosted git repository.
mgergely pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 2de6ae8 HIVE-23136 Do not compare q test result if
test.output.overwrite is specified (Miklos Gergely, reviewed by Laszlo Bodor)
2de6ae8 is described below
commit 2de6ae874c71d7cd8d7b25bd1f3025d53715d127
Author: miklosgergely <[email protected]>
AuthorDate: Sat Apr 4 10:05:11 2020 +0200
HIVE-23136 Do not compare q test result if test.output.overwrite is
specified (Miklos Gergely, reviewed by Laszlo Bodor)
---
itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index ffc0b2f..bebc37e 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -934,16 +934,14 @@ public class QTestUtil {
String outFileName = outPath(outDir, tname + outFileExtension);
File f = new File(logDir, tname + outFileExtension);
-
qOutProcessor.maskPatterns(f.getPath(), tname);
- QTestProcessExecResult exitVal =
qTestResultProcessor.executeDiffCommand(f.getPath(), outFileName, false, tname);
if (QTestSystemProperties.shouldOverwriteResults()) {
qTestResultProcessor.overwriteResults(f.getPath(), outFileName);
return QTestProcessExecResult.createWithoutOutput(0);
+ } else {
+ return qTestResultProcessor.executeDiffCommand(f.getPath(), outFileName,
false, tname);
}
-
- return exitVal;
}
public QTestProcessExecResult checkCompareCliDriverResults(String tname,
List<String> outputs) throws Exception {
