[ooo-build-commit] .: patches/dev300

[Thorsten Behrens]

 patches/dev300/apply                          |    1 
 patches/dev300/solenv-subsequenttest-fix.diff |   38 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

New commits:
commit 1d32d30f1f380eb0ed4f9e5374a22973e6175282
Author: Thorsten Behrens <thb at openoffice.org>
Date:   Thu Aug 19 00:04:27 2010 +0200

    Make subsequenttest work
    
    * patches/dev300/apply: added below
    * patches/dev300/solenv-subsequenttest-fix.diff: backport fix from
      master to have subsequenttest ignore missing .hg, adapt
      installtest makefile to openoffice.org3-less install

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 57ebd03..04b3bd5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1028,6 +1028,7 @@ libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek
+solenv-subsequenttest-fix.diff, i#112789, thorsten
 
 #Fixes of some changes in g++ 4.4 includes for debug mode
 g++44-debug.diff, cbosdo
diff --git a/patches/dev300/solenv-subsequenttest-fix.diff b/patches/dev300/solenv-subsequenttest-fix.diff
new file mode 100644
index 0000000..1002a08
--- /dev/null
+++ b/patches/dev300/solenv-subsequenttest-fix.diff
@@ -0,0 +1,38 @@
+Fix subsequenttest script looking for .hg
+
+From: Thorsten Behrens <thb at openoffice.org>
+
+
+---
+
+ solenv/bin/subsequenttests     |    2 +-
+ solenv/inc/installationtest.mk |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+
+diff --git solenv/bin/subsequenttests solenv/bin/subsequenttests
+index 34e6b80..3caa842 100755
+--- solenv/bin/subsequenttests
++++ solenv/bin/subsequenttests
+@@ -47,7 +47,7 @@ while (@ARGV) {
+ }
+ 
+ my @testpaths = ();
+-my $sc = SourceConfig->new();
++my $sc = SourceConfig->new($ENV{'SOLARSRC'});
+ my $module;
+ foreach $module ($sc->get_active_modules()) {
+     my $buildlst = $sc->get_module_build_list($module);
+diff --git solenv/inc/installationtest.mk solenv/inc/installationtest.mk
+index 6806e15..322ba4d 100644
+--- solenv/inc/installationtest.mk
++++ solenv/inc/installationtest.mk
+@@ -56,7 +56,7 @@ my_sofficepath = \
+     $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
+ .ELSE
+ my_sofficepath = \
+-    $(installationtest_instpath)/opt/openoffice.org3/program/soffice
++    $(installationtest_instpath)/opt/program/soffice
+ .END
+ 
+ .IF "$(OOO_TEST_SOFFICE)" == ""