svn commit: r1409605 - in /incubator/ooo/branches/gbuild/main/reportdesign: JunitTest_reportdesign_complex.mk Module_reportdesign.mk qa/complex/reportdesign/TestDocument.java

[arist]

Author: arist
Date: Thu Nov 15 00:18:39 2012
New Revision: 1409605

URL: http://svn.apache.org/viewvc?rev=1409605&view=rev
Log:
gnumake4_150_f0853c706de9.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1303837973 0
# Node ID f0853c706de9269870565990199f15e2b4de3abf
# Parent  ccd0baa1c81addc17ebc465dd96edef42ccd3a89
gnumake4: reportdesign: subsequent tests


Modified:
    
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
    incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk
    
incubator/ooo/branches/gbuild/main/reportdesign/qa/complex/reportdesign/TestDocument.java

Modified: 
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
URL: 
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk?rev=1409605&r1=1409604&r2=1409605&view=diff
==============================================================================
--- 
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
 (original)
+++ 
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
 Thu Nov 15 00:18:39 2012
@@ -27,6 +27,11 @@
 
 $(eval $(call gb_JunitTest_JunitTest,reportdesign_complex,SRCDIR))
 
+$(eval $(call gb_JunitTest_set_defs,reportdesign_complex,\
+       $$(DEFS) \
+       
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/reportdesign/qa/complex/reportdesign/test_documents
 \
+))
+
 $(eval $(call gb_JunitTest_add_sourcefiles,reportdesign_complex,\
        reportdesign/qa/complex/reportdesign/ReportDesignerTest \
        reportdesign/qa/complex/reportdesign/TestDocument \

Modified: incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk
URL: 
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk?rev=1409605&r1=1409604&r2=1409605&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk 
(original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk Thu 
Nov 15 00:18:39 2012
@@ -37,7 +37,10 @@ $(eval $(call gb_Module_add_targets,repo
        Package_xml \
 ))
 
-$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\
+# deactivated since sb123;
+# apparently fails because OOo does not find JVM?
+#$(eval $(call gb_Module_add_subsequentcheck_targets,reportdesign,\
        JunitTest_reportdesign_complex \
 ))
+
 # vim: set noet ts=4 sw=4:

Modified: 
incubator/ooo/branches/gbuild/main/reportdesign/qa/complex/reportdesign/TestDocument.java
URL: 
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/qa/complex/reportdesign/TestDocument.java?rev=1409605&r1=1409604&r2=1409605&view=diff
==============================================================================
--- 
incubator/ooo/branches/gbuild/main/reportdesign/qa/complex/reportdesign/TestDocument.java
 (original)
+++ 
incubator/ooo/branches/gbuild/main/reportdesign/qa/complex/reportdesign/TestDocument.java
 Thu Nov 15 00:18:39 2012
@@ -25,13 +25,14 @@ package complex.reportdesign;
 
 import java.io.File;
 import org.openoffice.test.OfficeFileUrl;
+import org.openoffice.test.Argument;
 
 final class TestDocument
 {
-    public static String getUrl(String name) 
-        {
-            return OfficeFileUrl.getAbsolute(new File("test_documents", name));
-        }
+    public static String getUrl(String name)
+    {
+        return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name));
+    }
 
     private TestDocument() {}
 }