1 files changed, 22 insertions, 44 deletions
diff --git a/sot/qa/complex/olesimplestorage/makefile.mk b/sot/qa/complex/olesimplestorage/makefile.mk
index 3420d798c9bc..cf3facf94d66 100644
--- a/sot/qa/complex/olesimplestorage/makefile.mk
+++ b/sot/qa/complex/olesimplestorage/makefile.mk
@@ -25,60 +25,38 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..$/..
-TARGET  = OLESimpleStorageUnitTest
-PRJNAME = sot
-PACKAGE = complex$/olesimplestorage
-
-# --- Settings -----------------------------------------------------
-.INCLUDE: settings.mk
-
-
-#----- compile .java files -----------------------------------------
-
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
-
-JAVAFILES       =\
-                                OLESimpleStorageUnitTest.java\
-                                OLESimpleStorageTest.java\
-                TestHelper.java\
-                Test01.java
-
-JAVACLASSFILES	= $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-#----- make a jar from compiled files ------------------------------
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-MAXLINELENGTH = 100000
+PRJ = ../../..
+PRJNAME = sot
+TARGET = qa_complex_olesimplestorage
 
-JARCLASSDIRS    = $(PACKAGE)
-JARTARGET       = $(TARGET).jar
-JARCOMPRESS 	= TRUE
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = complex/olesimplestorage
+JAVATESTFILES = \
+    OLESimpleStorageUnitTest.java
 
-# --- Parameters for the test --------------------------------------
+JAVAFILES = $(JAVATESTFILES) \
+    OLESimpleStorageTest.java \
+    Test01.java \
+    TestHelper.java
 
-# 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
+JARFILES = OOoRunner.jar ridl.jar test.jar unoil.jar jurt.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
-# test base is java complex
-CT_TESTBASE = -TestBase java_complex
+.INCLUDE: settings.mk
+.INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-# test looks something like the.full.package.TestName
-CT_TEST     = -o $(PACKAGE:s\$/\.\).$(JAVAFILES:b)
+ALLTAR : javatest
 
-# start the runner application
-CT_APP      = org.openoffice.Runner
+.END
 
-# --- Targets ------------------------------------------------------
 
-.INCLUDE: target.mk
 
-RUN: run
 
-run:
-    +java -cp $(CLASSPATH) $(CT_APP) $(CT_TESTBASE) $(CT_APPEXECCOMMAND) $(CT_TEST)