The following commit has been merged in the master branch: commit 690ae9b01165e71030ac36569238fcdf7780eb9d Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Sat Jan 22 22:41:01 2011 +0100
Disabling database access while testing units. diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch index 01ab963..c285bdb 100644 --- a/debian/patches/00-fix_build_system.patch +++ b/debian/patches/00-fix_build_system.patch @@ -2,16 +2,16 @@ apidb/build.xml | 2 ++ build-support/config/ant-build-common.properties | 2 +- build-support/script/build-ivy-base.xml | 11 +++++------ - build-support/script/build-java.xml | 2 +- + build-support/script/build-java.xml | 10 +++++----- build.xml | 1 + extract/build.xml | 2 ++ pgsnapshot/build.xml | 2 ++ - 7 files changed, 14 insertions(+), 8 deletions(-) + 7 files changed, 18 insertions(+), 12 deletions(-) Index: osmosis/apidb/build.xml =================================================================== ---- osmosis.orig/apidb/build.xml 2011-01-22 22:24:07.000000000 +0100 -+++ osmosis/apidb/build.xml 2011-01-22 22:29:19.000000000 +0100 +--- osmosis.orig/apidb/build.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/apidb/build.xml 2011-01-22 22:40:01.000000000 +0100 @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.Apidb" default="all" basedir="."> @@ -23,8 +23,8 @@ Index: osmosis/apidb/build.xml <import file="${build-support.dir}/script/build-java.xml"/> Index: osmosis/build-support/script/build-ivy-base.xml =================================================================== ---- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-22 22:24:07.000000000 +0100 -+++ osmosis/build-support/script/build-ivy-base.xml 2011-01-22 22:29:19.000000000 +0100 +--- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/build-support/script/build-ivy-base.xml 2011-01-22 22:40:01.000000000 +0100 @@ -9,6 +9,7 @@ <!-- Include common build components. --> <property name="build-support.dir" location="../"/> @@ -64,9 +64,9 @@ Index: osmosis/build-support/script/build-ivy-base.xml <ivy:info /> Index: osmosis/build-support/script/build-java.xml =================================================================== ---- osmosis.orig/build-support/script/build-java.xml 2011-01-22 22:24:07.000000000 +0100 -+++ osmosis/build-support/script/build-java.xml 2011-01-22 22:29:19.000000000 +0100 -@@ -109,7 +109,7 @@ +--- osmosis.orig/build-support/script/build-java.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/build-support/script/build-java.xml 2011-01-22 22:40:34.000000000 +0100 +@@ -109,12 +109,12 @@ </target> <!-- Runs all of the unit tests in the application. --> @@ -75,10 +75,28 @@ Index: osmosis/build-support/script/build-java.xml <mkdir dir="report/test"/> <!-- Determine the location of the database authorisation file. This can be overridden outside the build if necessary. --> +- <property name="db.apidb.authfile" location="test/data/input/v0_6/apidb-authfile.txt"/> +- <property name="db.pgsql.authfile" location="test/data/input/v0_6/pgsql-authfile.txt"/> ++ <!--<property name="db.apidb.authfile" location="test/data/input/v0_6/apidb-authfile.txt"/> ++ <property name="db.pgsql.authfile" location="test/data/input/v0_6/pgsql-authfile.txt"/>--> + + <junit fork="no" maxmemory="512m" printsummary="on" haltonerror="off" haltonfailure="off" filtertrace="on" failureproperty="test.failure"> + <formatter type="plain" usefile="true"/> +@@ -124,8 +124,8 @@ + <path location="build/src"/> + <path location="build/test"/> + </classpath> +- <sysproperty key="db.apidb.authfile" value="${db.apidb.authfile}"/> +- <sysproperty key="db.pgsql.authfile" value="${db.pgsql.authfile}"/> ++ <!--<sysproperty key="db.apidb.authfile" value="${db.apidb.authfile}"/> ++ <sysproperty key="db.pgsql.authfile" value="${db.pgsql.authfile}"/>--> + <batchtest todir="report/test"> + <fileset dir="build/test"> + <include name="**/*Test*.class"/> Index: osmosis/extract/build.xml =================================================================== ---- osmosis.orig/extract/build.xml 2011-01-22 22:24:07.000000000 +0100 -+++ osmosis/extract/build.xml 2011-01-22 22:29:19.000000000 +0100 +--- osmosis.orig/extract/build.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/extract/build.xml 2011-01-22 22:40:01.000000000 +0100 @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.Extract" default="all" basedir="."> @@ -90,8 +108,8 @@ Index: osmosis/extract/build.xml <import file="${build-support.dir}/script/build-java.xml"/> Index: osmosis/pgsnapshot/build.xml =================================================================== ---- osmosis.orig/pgsnapshot/build.xml 2011-01-22 22:24:07.000000000 +0100 -+++ osmosis/pgsnapshot/build.xml 2011-01-22 22:29:19.000000000 +0100 +--- osmosis.orig/pgsnapshot/build.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/pgsnapshot/build.xml 2011-01-22 22:40:01.000000000 +0100 @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <project name="Osmosis.PgSnapshot" default="all" basedir="."> @@ -102,8 +120,8 @@ Index: osmosis/pgsnapshot/build.xml <property name="build-support.dir" location="../build-support"/> Index: osmosis/build.xml =================================================================== ---- osmosis.orig/build.xml 2011-01-22 22:29:39.000000000 +0100 -+++ osmosis/build.xml 2011-01-22 22:29:41.000000000 +0100 +--- osmosis.orig/build.xml 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/build.xml 2011-01-22 22:40:01.000000000 +0100 @@ -10,6 +10,7 @@ <fileset dir="."> <include name="**/build.xml"/> @@ -114,8 +132,8 @@ Index: osmosis/build.xml </target> Index: osmosis/build-support/config/ant-build-common.properties =================================================================== ---- osmosis.orig/build-support/config/ant-build-common.properties 2011-01-22 22:30:58.000000000 +0100 -+++ osmosis/build-support/config/ant-build-common.properties 2011-01-22 22:31:13.000000000 +0100 +--- osmosis.orig/build-support/config/ant-build-common.properties 2011-01-22 22:31:27.000000000 +0100 ++++ osmosis/build-support/config/ant-build-common.properties 2011-01-22 22:40:01.000000000 +0100 @@ -10,7 +10,7 @@ dependency.version.osmosis-hstore=0.2 dependency.version.ivy=2.1.0 -- Osmosis, an OSM data processor _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel