QPID-1157: Updated scripts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@673071 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 11 insertions, 15 deletions

diff --git a/cc/config/bdbstore-cpp-trunk.xml b/cc/config/bdbstore-cpp-trunk.xml
index ce80d37820..1584791518 100644
--- a/cc/config/bdbstore-cpp-trunk.xml
+++ b/cc/config/bdbstore-cpp-trunk.xml
@@ -33,7 +33,7 @@ under the License.
         </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>

 

diff --git a/cc/config/java/cpp.noprefetch.testprofile b/cc/config/java/cpp.noprefetch.testprofile
index a69a5295f5..3654e271dc 100644
--- a/cc/config/java/cpp.noprefetch.testprofile
+++ b/cc/config/java/cpp.noprefetch.testprofile
@@ -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.mem=512M
 test=*Test
 haltonfailure=no
 haltonerror=no
-max_prefetch=0
 exclude.modules=systests
\ No newline at end of file
diff --git a/cc/config/java/cpp.testprofile b/cc/config/java/cpp.testprofile
index 63b36638ad..15db7f93bc 100644
--- a/cc/config/java/cpp.testprofile
+++ b/cc/config/java/cpp.testprofile
@@ -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 @@ 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
+exclude.modules=systests
diff --git a/cc/config/java/java.testprofile b/cc/config/java/java.testprofile
index a0eacd0516..6f988dc261 100644
--- a/cc/config/java/java.testprofile
+++ b/cc/config/java/java.testprofile
@@ -3,16 +3,15 @@ broker=vm
 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
diff --git a/cc/scripts/bdbstorecppbuild.sh b/cc/scripts/bdbstorecppbuild.sh
index 9096e13e31..3385c8d2f4 100755
--- a/cc/scripts/bdbstorecppbuild.sh
+++ b/cc/scripts/bdbstorecppbuild.sh
@@ -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