Repository: bigtop Updated Branches: refs/heads/master 7f1c58f05 -> 24bf42da7
BIGTOP-2239. Smoke tests should have a single location for logger configuration Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/eae6ed3e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/eae6ed3e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/eae6ed3e Branch: refs/heads/master Commit: eae6ed3ea2f92a4886908cf4a236bf986c420b02 Parents: 7f1c58f Author: Konstantin Boudnik <c...@apache.org> Authored: Thu Jan 14 20:36:26 2016 -0800 Committer: Konstantin Boudnik <c...@apache.org> Committed: Fri Jan 15 13:45:32 2016 -0800 ---------------------------------------------------------------------- bigtop-tests/smoke-tests/build.gradle | 10 +--------- .../smoke-tests/logger-test-config/build.gradle | 20 ++++++++++++++++++++ .../src/main/resources/log4j.properties | 20 ++++++++++++++++++++ 3 files changed, 41 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/eae6ed3e/bigtop-tests/smoke-tests/build.gradle ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/build.gradle b/bigtop-tests/smoke-tests/build.gradle index 5145b79..95e886a 100644 --- a/bigtop-tests/smoke-tests/build.gradle +++ b/bigtop-tests/smoke-tests/build.gradle @@ -39,17 +39,9 @@ subprojects { testCompile group: 'org.codehaus.groovy', name: 'groovy', version: groovyVersion testCompile group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion, transitive: 'true' testCompile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion, transitive: 'true' + testRuntime project(':bigtop-tests:smoke-tests:logger-test-config') } - sourceSets { - test { - resources { - srcDirs = [ - 'conf/', - ] - } - } - } //Note you need a snapshot itest to run this. ext.doExclude = { String filename -> //print("Exclude? ${filename} ... ") http://git-wip-us.apache.org/repos/asf/bigtop/blob/eae6ed3e/bigtop-tests/smoke-tests/logger-test-config/build.gradle ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/logger-test-config/build.gradle b/bigtop-tests/smoke-tests/logger-test-config/build.gradle new file mode 100644 index 0000000..98c9101 --- /dev/null +++ b/bigtop-tests/smoke-tests/logger-test-config/build.gradle @@ -0,0 +1,20 @@ +/** + * 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 + * <p/> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p/> + * 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. + */ +dependencies { + runtime group: 'log4j', name: 'log4j', version: '1.2.17' +} http://git-wip-us.apache.org/repos/asf/bigtop/blob/eae6ed3e/bigtop-tests/smoke-tests/logger-test-config/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/bigtop-tests/smoke-tests/logger-test-config/src/main/resources/log4j.properties b/bigtop-tests/smoke-tests/logger-test-config/src/main/resources/log4j.properties new file mode 100644 index 0000000..165d0f9 --- /dev/null +++ b/bigtop-tests/smoke-tests/logger-test-config/src/main/resources/log4j.properties @@ -0,0 +1,20 @@ +# 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=INFO,console +log4j.threshhold=ALL +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.target=System.err +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
