From feb3a59875c200b5562e55957c752fada9479eb8 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 28 Nov 2010 11:08:43 +0000
Subject: [PATCH] make sure tests.verbose works in solr, print test params when
 verbose is set

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1039868 13f79535-47bb-0310-9956-ffa450edef68
---
 lucene/src/test/org/apache/lucene/util/LuceneTestCase.java | 4 ++--
 solr/build.xml                                             | 1 +
 solr/common-build.xml                                      | 1 +
 solr/contrib/analysis-extras/build.xml                     | 1 +
 solr/contrib/clustering/build.xml                          | 1 +
 solr/contrib/dataimporthandler/build.xml                   | 2 ++
 solr/contrib/extraction/build.xml                          | 1 +
 7 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
index ad355b85705..90c5903fac4 100644
--- a/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
+++ b/lucene/src/test/org/apache/lucene/util/LuceneTestCase.java
@@ -368,8 +368,8 @@ public abstract class LuceneTestCase extends Assert {
         }
       }
     stores = null;
-    // if tests failed, report some information back
-    if (testsFailed)
+    // if verbose or tests failed, report some information back
+    if (VERBOSE || testsFailed)
       System.out.println("NOTE: test params are: codec=" + codecDescription + 
         ", locale=" + locale + 
         ", timezone=" + (timeZone == null ? "(null)" : timeZone.getID()));
diff --git a/solr/build.xml b/solr/build.xml
index 60199cfb420..e6b7f2bc5af 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -433,6 +433,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <sysproperty key="jetty.testMode" value="1"/>
       <sysproperty key="tempDir" file="@{tempDir}/@{threadNum}"/>
       <sysproperty key="testmethod" value="${testmethod}"/>
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 44028f9054f..57b56adafe6 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -62,6 +62,7 @@
   <property name="tests.iter" value="1" />
   <property name="tests.seed" value="random" />
   <property name="tests.nightly" value="false" />
+  <property name="tests.verbose" value="false" />
 
   <condition property="dir.prop" value="-Dsolr.directoryFactory=solr.StandardDirectoryFactory">
     <isset property="use.fsdir"/>
diff --git a/solr/contrib/analysis-extras/build.xml b/solr/contrib/analysis-extras/build.xml
index 9857db8ba5e..e882f5bdf5b 100644
--- a/solr/contrib/analysis-extras/build.xml
+++ b/solr/contrib/analysis-extras/build.xml
@@ -147,6 +147,7 @@
       <sysproperty key="tests.timezone" value="${tests.timezone}"/>
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
diff --git a/solr/contrib/clustering/build.xml b/solr/contrib/clustering/build.xml
index 62f5ce11e73..43fff8c9a21 100644
--- a/solr/contrib/clustering/build.xml
+++ b/solr/contrib/clustering/build.xml
@@ -115,6 +115,7 @@
       <sysproperty key="tests.timezone" value="${tests.timezone}"/>
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
diff --git a/solr/contrib/dataimporthandler/build.xml b/solr/contrib/dataimporthandler/build.xml
index 49d57cf452a..cd0decfdc0d 100644
--- a/solr/contrib/dataimporthandler/build.xml
+++ b/solr/contrib/dataimporthandler/build.xml
@@ -168,6 +168,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
       <sysproperty key="jetty.testMode" value="1"/>
@@ -228,6 +229,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
       <sysproperty key="jetty.testMode" value="1"/>
diff --git a/solr/contrib/extraction/build.xml b/solr/contrib/extraction/build.xml
index 114f72a3b3b..86f2b2ab812 100644
--- a/solr/contrib/extraction/build.xml
+++ b/solr/contrib/extraction/build.xml
@@ -117,6 +117,7 @@
       <sysproperty key="tests.multiplier" value="${tests.multiplier}"/>
       <sysproperty key="tests.iter" value="${tests.iter}"/>
       <sysproperty key="tests.seed" value="${tests.seed}"/>
+      <sysproperty key="tests.verbose" value="${tests.verbose}"/>
       <!-- set whether or not nightly tests should run -->
       <sysproperty key="tests.nightly" value="${tests.nightly}"/>
       <sysproperty key="jetty.testMode" value="1"/>