CWS changehid: resync to m90ooo/DEV300_m91

1 files changed, 26 insertions, 41 deletions

diff --git a/framework/qa/complex/broken_document/makefile.mk b/framework/qa/complex/broken_document/makefile.mk
index c8f24a9371..8b1cf2ac3b 100755
--- a/framework/qa/complex/broken_document/makefile.mk
+++ b/framework/qa/complex/broken_document/makefile.mk
@@ -25,56 +25,41 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = CheckHeadlessState
-PRJNAME = $(TARGET)
-PACKAGE = complex$/broken_document
 
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES = mysql.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-JAVAFILES       = LoadDocument.java
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
-
-MAXLINELENGTH = 100000
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+PRJ = ../../..
+PRJNAME = framework
+TARGET = qa_complex_broken_document
 
-# --- Parameters for the test --------------------------------------
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/broken_document
 
-# start an office if the parameter is set for the makefile
-.IF "$(OFFICE)" == ""
-CT_APPEXECCOMMAND =
-.ELSE
-CT_APPEXECCOMMAND = -AppExecutionCommand "$(OFFICE)$/soffice -accept=socket,host=localhost,port=8100;urp;"
-.ENDIF
+# here store only Files which contain a @Test
+JAVATESTFILES = \
+    LoadDocument.java
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+# put here all other files
+JAVAFILES = $(JAVATESTFILES) \
+    TestDocument.java
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar
+#JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar \
+#                  OOoRunner.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+# Sample how to debug
+# JAVAIFLAGS=-Xdebug  -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
 
-# the current directory for loading the document
-CT_WORKDIR  = -WorkingDir $(PWD)
+.END
 
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
+ALLTAR : javatest
 
-RUN:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_APPEXECCOMMAND) $(CT_TESTBASE) $(CT_WORKDIR) $(CT_TEST)
+.END
 
-run: RUN