svn commit: r1779693 - in /openoffice/trunk/main/sd: JunitTest_sd_unoapi.mk Module_sd.mk qa/unoapi/Test.java

[damjan]

Author: damjan
Date: Sat Jan 21 00:42:34 2017
New Revision: 1779693

URL: http://svn.apache.org/viewvc?rev=1779693&view=rev
Log:
Add a main/sd subsequent test that wasn't hooked into the build.

Patch by: me

Modified:
    openoffice/trunk/main/sd/JunitTest_sd_unoapi.mk
    openoffice/trunk/main/sd/Module_sd.mk
    openoffice/trunk/main/sd/qa/unoapi/Test.java

Modified: openoffice/trunk/main/sd/JunitTest_sd_unoapi.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/JunitTest_sd_unoapi.mk?rev=1779693&r1=1779692&r2=1779693&view=diff
==============================================================================
--- openoffice/trunk/main/sd/JunitTest_sd_unoapi.mk (original)
+++ openoffice/trunk/main/sd/JunitTest_sd_unoapi.mk Sat Jan 21 00:42:34 2017
@@ -21,7 +21,7 @@
 
 
 
-$(eval $(call gb_JunitTest_JunitTest,sd_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR))
 
 $(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
        $$(DEFS) \

Modified: openoffice/trunk/main/sd/Module_sd.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/Module_sd.mk?rev=1779693&r1=1779692&r2=1779693&view=diff
==============================================================================
--- openoffice/trunk/main/sd/Module_sd.mk (original)
+++ openoffice/trunk/main/sd/Module_sd.mk Sat Jan 21 00:42:34 2017
@@ -33,3 +33,9 @@ $(eval $(call gb_Module_add_targets,sd,\
        Package_uiconfig \
        Package_xml \
 ))
+
+ifneq ($(OOO_JUNIT_JAR),)
+$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
+       JunitTest_sd_unoapi \
+))
+endif

Modified: openoffice/trunk/main/sd/qa/unoapi/Test.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/qa/unoapi/Test.java?rev=1779693&r1=1779692&r2=1779693&view=diff
==============================================================================
--- openoffice/trunk/main/sd/qa/unoapi/Test.java (original)
+++ openoffice/trunk/main/sd/qa/unoapi/Test.java Sat Jan 21 00:42:34 2017
@@ -24,6 +24,7 @@
 package org.openoffice.sd.qa.unoapi;
 
 import org.openoffice.Runner;
+import org.openoffice.test.Argument;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
 
@@ -41,7 +42,7 @@ public final class Test {
     @org.junit.Test public void test() {
         assertTrue(
             Runner.run(
-                "-sce", "sd.sce", "-xcl", "knownissues.xcl", "-cs",
+                "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), 
"-cs",
                 connection.getDescription()));
     }