Author: arnaudsimon
Date: Tue Jul 1 05:45:33 2008
New Revision: 673071
URL: http://svn.apache.org/viewvc?rev=673071&view=rev
Log:
QPID-1157: Updated scripts
Modified:
incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml
incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile
incubator/qpid/trunk/qpid/cc/config/java/java.testprofile
incubator/qpid/trunk/qpid/cc/scripts/bdbstorecppbuild.sh
Modified: incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml?rev=673071&r1=673070&r2=673071&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml (original)
+++ incubator/qpid/trunk/qpid/cc/config/bdbstore-cpp-trunk.xml Tue Jul 1
05:45:33 2008
@@ -33,7 +33,7 @@
</bootstrappers>
<modificationset quietperiod="30">
- <buildstatus logdir="/logs/qpid-cpp-trunk/"/>
+ <buildstatus logdir="${env.CC_HOME}/cc/logs/qpid-cpp-trunk/"/>
<svn localWorkingCopy="${env.CPPSTORE_HOME}"/>
</modificationset>
Modified: incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile?rev=673071&r1=673070&r2=673071&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile
(original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cpp.noprefetch.testprofile Tue Jul
1 05:45:33 2008
@@ -1,9 +1,10 @@
broker.version=0-10
broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t
--load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir
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=0
test.excludes=true
-broker.ready=Listening on TCP port
test.excludesfile=${project.root}/cppNoPrefetchExcludeList
log=info
amqj.logging.level=$log
@@ -14,5 +15,4 @@
test=*Test
haltonfailure=no
haltonerror=no
-max_prefetch=0
exclude.modules=systests
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile?rev=673071&r1=673070&r2=673071&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/cpp.testprofile Tue Jul 1
05:45:33 2008
@@ -1,10 +1,11 @@
broker.version=0-10
broker=${project.root}/../cpp/src/qpidd --data-dir ${build.data} -t
--load-module store_home/lib/.libs/libbdbstore.so --auth no --no-module-dir
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
test.excludes=true
-test.excludesfile=${project.root}/010AsyncExcludeList
-broker.ready=Listening on TCP port
+test.excludesfile=${project.root}/cppExcludeList
log=info
amqj.logging.level=$log
root.logging.level=$log
@@ -12,8 +13,6 @@
test.fork=no
test.mem=512M
test=*Test
-test1=*Tests
haltonfailure=no
haltonerror=no
-max_prefetch=1000
-exclude.modules=systests
\ No newline at end of file
+exclude.modules=systests
Modified: incubator/qpid/trunk/qpid/cc/config/java/java.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/config/java/java.testprofile?rev=673071&r1=673070&r2=673071&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/config/java/java.testprofile (original)
+++ incubator/qpid/trunk/qpid/cc/config/java/java.testprofile Tue Jul 1
05:45:33 2008
@@ -3,16 +3,15 @@
broker.clean=${project.root}/clean-dir ${build.data}
java.naming.provider.url=${project.root}/test-provider.properties
test.excludes=true
-test.excludesfile=${project.root}/08ExcludeList
+test.excludesfile=${project.root}/javaExcludeList
log=info
+max_prefetch=1000
amqj.logging.level=$log
root.logging.level=$log
-log4j.configuration=file://${project.root}/log4j-test.xml
+log4j.configuration=file:///${project.root}/log4j-test.xml
test.fork=no
test.mem=512M
test=*Test
-test1=*Tests
haltonfailure=no
haltonerror=no
-max_prefetch=1000
exclude.modules=systests
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/cc/scripts/bdbstorecppbuild.sh
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cc/scripts/bdbstorecppbuild.sh?rev=673071&r1=673070&r2=673071&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cc/scripts/bdbstorecppbuild.sh (original)
+++ incubator/qpid/trunk/qpid/cc/scripts/bdbstorecppbuild.sh Tue Jul 1
05:45:33 2008
@@ -21,6 +21,4 @@
if [ -f Makefile ]; then
make distclean
fi
- ./bootstrap && \
- ./configure CXXFLAGS="-O3 -DNDEBUG" --with-qpid-checkout=$CC_HOME && \
- make
+ ./bootstrap && ./configure CXXFLAGS="-O3 -DNDEBUG"
--with-qpid-checkout=$CC_HOME && make
