Now the hbase tests don't spit out too much logs, made the running of the hbase tests optional

This commit is contained in:
David Greco 2010-09-23 19:37:18 +02:00
parent 2a2bddef5a
commit 31f0194b8c
3 changed files with 38 additions and 1 deletions

View file

@ -0,0 +1,25 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
log4j.rootLogger=ERROR,R
# rolling log file ("system.log
log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
log4j.appender.R.File=target/logs/system.log

View file

@ -16,6 +16,10 @@
</encoder>
</appender>
<logger name="se.scalablesolutions" level="DEBUG"/>
<logger name="org.mortbay.log" level="ERROR"/>
<logger name="org.apache.jasper" level="ERROR"/>
<root level="DEBUG">
<appender-ref ref="stdout"/>
</root>

View file

@ -563,6 +563,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
<dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2" conf="test">
<exclude module="slf4j-api"/>
</dependency>
<dependency org="org.slf4j" name="slf4j-api" rev={SLF4J_VERSION} conf="test">
</dependency>
<dependency org="org.apache.hbase" name="hbase-test" rev="0.20.6" conf="test">
</dependency>
<dependency org="log4j" name="log4j" rev="1.2.15" conf="test">
@ -571,7 +573,13 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
</dependency>
</dependencies>
override def testOptions = TestFilter((name: String) => name.endsWith("Test")) :: Nil
val hbase_test = System.getenv("HBASE_TEST")
override def testOptions = { val o = TestFilter((name: String) => name.endsWith("Test")) :: Nil
if(hbase_test != "true")
o
else
Nil
}
}
// akka-persistence-voldemort subproject