diff options
Diffstat (limited to 'forms/qa')
| -rw-r--r-- | forms/qa/integration/forms/ListSelection.java | 5 | ||||
| -rw-r--r-- | forms/qa/makefile.mk | 13 | ||||
| -rw-r--r-- | forms/qa/unoapi/knownissues.xcl | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/forms/qa/integration/forms/ListSelection.java b/forms/qa/integration/forms/ListSelection.java index e26acd69c..fb5831a34 100644 --- a/forms/qa/integration/forms/ListSelection.java +++ b/forms/qa/integration/forms/ListSelection.java @@ -136,8 +136,8 @@ public class ListSelection extends integration.forms.TestCase } catch( com.sun.star.uno.Exception e ) { - System.err.println( e ); e.printStackTrace( System.err ); + failed( "caught an exception: " + e.toString() ); } } @@ -183,6 +183,7 @@ public class ListSelection extends integration.forms.TestCase catch( com.sun.star.uno.Exception e ) { e.printStackTrace( System.err ); + failed( "caught an exception: " + e.toString() ); } } @@ -217,6 +218,7 @@ public class ListSelection extends integration.forms.TestCase catch( com.sun.star.uno.Exception e ) { e.printStackTrace( System.err ); + failed( "caught an exception: " + e.toString() ); } } @@ -275,6 +277,7 @@ public class ListSelection extends integration.forms.TestCase catch( java.lang.Throwable e ) { e.printStackTrace(); + failed( "caught an exception: " + e.toString() ); } } diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk index afafcca42..b19f7864c 100644 --- a/forms/qa/makefile.mk +++ b/forms/qa/makefile.mk @@ -66,14 +66,11 @@ ALL: ALLDEP .INCLUDE : target.mk -test: - echo $(SOLARBINDIR) - -show_targets: +show_targets: $(CLASSDIR)$/$(JARTARGET) +@$(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) complexlib.ShowTargets $(foreach,i,$(JAVAFILES) $(i:s/.\$///:s/.java//)) -run: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce +run: $(CLASSDIR)$/$(JARTARGET) + +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -sce forms_all.sce -run_%: - +$(COPY) integration$/forms$/*.props $(CLASSDIR)$/$(PACKAGE) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) +run_%: $(CLASSDIR)$/$(JARTARGET) + +$(COPY) integration$/forms$/*.props $(CLASSDIR) && $(AUGMENT_LIBRARY_PATH) java $(RUNNER_CLASSPATH) $(RUNNER_ARGS) -o integration.$(PRJNAME).$(@:s/run_//) diff --git a/forms/qa/unoapi/knownissues.xcl b/forms/qa/unoapi/knownissues.xcl index eb8efe91b..66e02dc8d 100644 --- a/forms/qa/unoapi/knownissues.xcl +++ b/forms/qa/unoapi/knownissues.xcl @@ -121,10 +121,6 @@ forms.OComboBoxModel::com::sun::star::form::XUpdateBroadcaster forms.OFileControlModel::com::sun::star::beans::XFastPropertySet forms.OFileControlModel::com::sun::star::form::FormControlModel -### i111148 ### -forms.OImageControlModel::com::sun::star::beans::XMultiPropertySet -forms.OImageControlModel::com::sun::star::beans::XPropertySet - ### i113201 ### forms.OEditModel::com::sun::star::form::validation::XValidatableFormComponent |