Author: ritchiem Date: 2008-09-02 10:32:02 -0400 (Tue, 02 Sep 2008) New Revision: 2370 Added: store/branches/java/broker-queue-refactor/java/bdbstore/default.testprofile store/branches/java/broker-queue-refactor/java/bdbstore/log4j-test.xml Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml Log: Updated build system to run BDB tests Modified: store/branches/java/broker-queue-refactor/java/bdbstore/build.xml =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-02 14:31:35 UTC (rev 2369) +++ store/branches/java/broker-queue-refactor/java/bdbstore/build.xml 2008-09-02 14:32:02 UTC (rev 2370) @@ -3,13 +3,24 @@ --> <project name="BDBStore" default="build"> - <property name="src.dir" location="src/main/java"/> + <property name="src.tools.dir" location="src/tools/java"/> + <property name="src.main.dir" location="src/main/java"/> <property name="src.test.dir" location="src/test/java"/> <property name="build.dir" location="build"/> <property name="lib.dir" location="lib"/> <property name="build.classes" location="build/classes"/> <property name="build.test.classes" location="build/test/classes"/> + <property name="build.tools.classes" location="build/tools/classes"/> + <property name="build.results" location="build/results"/> + <property name="java.naming.factory.initial" value="org.apache.qpid.jndi.PropertiesFileInitialContextFactory"/> + + <available property="src.test.dir.exists" file="${src.test.dir}"/> + + <dirname property="project.root" file="${ant.file.common}"/> + + <property file="${project.root}/default.testprofile"/> + <path id="class.path"> <fileset dir="lib"> <include name="**/*.jar"/> @@ -19,40 +30,47 @@ <path id="test.class.path"> <path refid="class.path"/> <pathelement path="${build.classes}"/> + <pathelement path="${build.tools.classes}"/> + <pathelement path="${build.test.classes}"/> </path> <target name="init"> - <mkdir dir="build/classes"/> - <mkdir dir="build/test/classes"/> + <mkdir dir="${build.classes}"/> + <mkdir dir="${build.test.classes}"/> + <mkdir dir="${build.tools.classes}"/> + <mkdir dir="${build.results}"/> </target> <target name="clean" description="remove build artifacts"> <delete dir="${build.dir}"/> </target> - <target name="build" depends="init"> - <javac srcdir="${src.dir}" + <target name="build" depends="init,build-main,build-tests,build-tools"/> + + <target name="build-main" depends="init"> + <javac srcdir="${src.main.dir}" destdir="${build.classes}" - classpathref="class.path"/> + classpathref="test.class.path"/> </target> - <target name="build-tests" depends="build"> + <target name="build-tests" depends="init,build-main"> <javac srcdir="${src.test.dir}" destdir="${build.test.classes}" classpathref="test.class.path"/> </target> - <target name="jar" depends="build"> - <jar destfile="build/qpid-bdbstore.jar" basedir="build/classes"/> + <target name="build-tools" depends="init,build-main"> + <javac srcdir="${src.tools.dir}" + destdir="${build.tools.classes}" + classpathref="test.class.path"/> </target> - - <target name="test" depends="build, build-tests"> - + <target name="jar" depends="build"> + <jar destfile="build/qpid-bdbstore.jar" basedir="${build.classes}"/> + <jar destfile="build/qpid-tools.jar" basedir="${build.tools.dir}"/> </target> - - <target name="teststuff" depends="build,build-tests" if="module.test.src.exists" + <target name="test" depends="build-tests" if="src.test.dir.exists" unless="${dontruntest}" description="execute unit tests"> <delete file="${module.failed}"/> @@ -74,22 +92,25 @@ <sysproperty key="test.excludesfile" value="${test.excludesfile}"/> <sysproperty key="max_prefetch" value ="${max_prefetch}"/> <sysproperty key="example.plugin.target" value="${project.root}/build/lib/plugins"/> - <sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/broker"/> - <sysproperty key="QPID_HOME" value="${project.root}/broker"/> + <sysproperty key="QPID_HOME" value="${project.root}"/> + <sysproperty key="QPID_WORK" value="${project.root}/build/test-work"/> + <sysproperty key="BDB_HOME" value="${project.root}"/> + + <formatter type="plain"/> <formatter type="xml"/> - <classpath refid="module.test.path"/> + <classpath refid="test.class.path"/> - <batchtest fork="${test.fork}" todir="${module.results}"> - <fileset dir="${module.test.src}" excludes="${module.test.excludes}"> + <batchtest fork="${test.fork}" todir="${build.results}"> + <fileset dir="${src.test.dir}" excludes="${module.test.excludes}"> <include name="**/${test}.java"/> </fileset> </batchtest> </junit> - <antcall target="touch-failed"/> + <!--antcall target="touch-failed"/--> <condition property="failed"> <and> @@ -102,7 +123,6 @@ </target> - <target name="release" depends="jar"/> + <target name="release" depends="jar"/> - </project> Added: store/branches/java/broker-queue-refactor/java/bdbstore/default.testprofile =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/default.testprofile (rev 0) +++ store/branches/java/broker-queue-refactor/java/bdbstore/default.testprofile 2008-09-02 14:32:02 UTC (rev 2370) @@ -0,0 +1,23 @@ +broker.version=0-8 +broker=vm +broker.clean=${project.root}/clean-dir ${build.data} +broker.ready=Listening on TCP port + +java.naming.provider.url=${project.root}/test-provider.properties +max_prefetch=1000 + +log=debug +amqj.logging.level=${log} +amqj.protocol.logging.level=${log} +root.logging.level=${log} +log4j.configuration=file:///${project.root}/log4j-test.xml +log4j.debug=false + +test.excludes=true +test.excludesfile=${project.root}/08ExcludeList +test.fork=no +test.mem=512M +test=*Test +haltonfailure=no +haltonerror=no +exclude.modules=none Added: store/branches/java/broker-queue-refactor/java/bdbstore/log4j-test.xml =================================================================== --- store/branches/java/broker-queue-refactor/java/bdbstore/log4j-test.xml (rev 0) +++ store/branches/java/broker-queue-refactor/java/bdbstore/log4j-test.xml 2008-09-02 14:32:02 UTC (rev 2370) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!-- + 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. +--> + +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<!-- ===================================================================== --> +<!-- --> +<!-- Log4j configuration for unit tests --> +<!-- --> +<!-- ===================================================================== --> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + <appender name="console" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/> + </layout> + </appender> + + <logger name="org.apache.qpid"> + <level value="${amqj.logging.level}"/> + </logger> + + <logger name="qpid.protocol"> + <level value="${amqj.protocol.logging.level}"/> + </logger> + + <logger name="org.apache.qpid.test"> + <level value="ALL"/> + </logger> + + <root> + <level value="${root.logging.level}"/> + <appender-ref ref="console" /> + </root> +</log4j:configuration>